diff --git a/cogs/timings_check.yml b/cogs/timings_check.yml index f669044..43b9097 100644 --- a/cogs/timings_check.yml +++ b/cogs/timings_check.yml @@ -24,7 +24,6 @@ plugins: prefix: "⚠" value: |- Plugins that claim to remove lag actually cause more lag. - Remove ClearLag. LagAssist: prefix: "⚠" value: |- @@ -34,27 +33,22 @@ plugins: prefix: "⚠" value: |- Plugins that claim to remove lag actually cause more lag. - Remove NoChunkLag. - ServerBooster: + NoMobLag: prefix: "⚠" value: |- - Plugins that claim to remove lag actually cause more lag. - Remove ServerBooster. - MobLimiter: + Plugins that claim to remove lag actually cause more lag. + ServerBooster: prefix: "⚠" value: |- - You probably don't need MobLimiter as Bukkit already has its features. - Remove MobLimiter. + Plugins that claim to remove lag actually cause more lag. BookLimiter: prefix: "⚠" value: |- - You probably don't need BookLimiter as Paper already has its features. - Remove BookLimiter. + You don't need BookLimiter as Paper already has its features. LimitPillagers: prefix: "⚠" value: |- You probably don't need LimitPillagers as Paper already adds its features. - Remove LimitPillagers. VillagerOptimiser: prefix: "⚠" value: |- @@ -64,22 +58,18 @@ plugins: prefix: "⚠" value: |- Stacking plugins actually cause more lag. - Remove StackMob. Stacker: prefix: "⚠" value: |- Stacking plugins actually cause more lag. - Remove Stacker. MobStacker: prefix: "⚠" value: |- Stacking plugins actually cause more lag. - Remove MobStacker. WildStacker: prefix: "⚠" value: |- Stacking plugins actually cause more lag. - Remove WildStacker. SuggestionBlocker: prefix: "⚠" value: |- @@ -95,35 +85,26 @@ plugins: value: |- CMI is a buggy plugin. Consider replacing CMI with [EssentialsX](https://essentialsx.net/downloads.html). - Spartan: - prefix: "⚠" - value: |- - Spartan is a laggy anticheat. - Consider replacing it with [Matrix](https://matrix.rip/), [NCP](https://ci.codemc.io/job/Updated-NoCheatPlus/job/Updated-NoCheatPlus/), or [AAC](https://www.spigotmc.org/resources/aac-advanced-anti-cheat-hack-kill-aura-blocker.6442/). IllegalStack: prefix: "⚠" value: |- - You probably don't need IllegalStack as Paper already has its features. - Remove IllegalStack. + You probably don't need IllegalStack for survival servers as Paper already has its features. ExploitFixer: prefix: "⚠" value: |- You probably don't need ExploitFixer as Paper already has its features. - Remove ExploitFixer. EntityTrackerFixer: prefix: "⚠" value: |- You don't need EntityTrackerFixer as Paper already has its features. - Remove EntityTrackerFixer. Orebfuscator: prefix: "⚠" value: |- - You don't need Orebfuscator as Paper already has its features. - Remove Orebfuscator. + You don't need Orebfuscator as [Paper](https://gist.github.com/stonar96/ba18568bd91e5afd590e8038d14e245e) already has its features. ImageOnMap: prefix: "⚠" value: |- - This plugin has a [memory leak](https://github.com/zDevelopers/ImageOnMap/issues/104). If it is not essential, you should remove it. + This plugin has a [memory leak](https://github.com/zDevelopers/ImageOnMap/issues/104). Consider replacing it with [an alternative](https://www.spigotmc.org/resources/drmap.87368/). GroupManager: prefix: "⚠" @@ -146,24 +127,26 @@ plugins: prefix: "⚠" value: |- You probably don't need PhantomSMP as Paper already has its features. - Remove PhantomSMP. - expressions: - paper["world-settings"]["default"]["phantoms-only-attack-insomniacs"] == "true" prefix: "⚠" value: |- You probably don't need PhantomSMP as Paper already has its features. Enable phantoms-only-attack-insomniacs in [paper.yml](http://bit.ly/paperconf). + tuinity: + PacketLimiter: + prefix: "⚠" + value: |- + You don't need PacketLimiter as Tuinity already has its features. purpur: SilkSpawners: prefix: "⚠" value: |- You probably don't need SilkSpawners as Purpur already has its features. - Remove SilkSpawners. MineableSpawners: prefix: "⚠" value: |- You probably don't need MineableSpawners as Purpur already has its features. - Remove MineableSpawners. VillagerLobotomizatornator: prefix: "⚠" value: |- diff --git a/cogs/timings_public.py b/cogs/timings_public.py index 4855935..b8b86fa 100644 --- a/cogs/timings_public.py +++ b/cogs/timings_public.py @@ -59,7 +59,6 @@ class Timings(commands.Cog): await message.reply(embed=embed_var) return - unchecked = 0 try: try: version = request["timingsMaster"]["version"] @@ -74,7 +73,6 @@ class Timings(commands.Cog): break except KeyError as key: print("Missing: " + str(key)) - unchecked += 1 try: timing_cost = int(request["timingsMaster"]["system"]["timingcost"]) @@ -84,7 +82,6 @@ class Timings(commands.Cog): timing_cost) + ". Find a [better host](https://www.birdflop.com).") except KeyError as key: print("Missing: " + str(key)) - unchecked += 1 try: jvm_version = request["timingsMaster"]["system"]["jvmversion"] @@ -93,7 +90,6 @@ class Timings(commands.Cog): value="You are using Java " + jvm_version + ". Update to [Java 11](https://adoptopenjdk.net/installation.html).") except KeyError as key: print("Missing: " + str(key)) - unchecked += 1 try: flags = request["timingsMaster"]["system"]["flags"] @@ -144,7 +140,6 @@ class Timings(commands.Cog): value="Use [Aikar's flags](https://aikar.co/2018/07/02/tuning-the-jvm-g1gc-garbage-collector-flags-for-minecraft/).") except KeyError as key: print("Missing: " + str(key)) - unchecked += 1 try: cpu = int(request["timingsMaster"]["system"]["cpu"]) @@ -158,13 +153,13 @@ class Timings(commands.Cog): cpu) + " threads. Find a [better host](https://www.birdflop.com).") except KeyError as key: print("Missing: " + str(key)) - unchecked += 1 plugins = request["timingsMaster"]["plugins"] if "plugins" in request["timingsMaster"] else None server_properties = request["timingsMaster"]["config"]["server.properties"] if "server.properties" in request["timingsMaster"]["config"] else None bukkit = request["timingsMaster"]["config"]["bukkit"] if "bukkit" in request["timingsMaster"]["config"] else None spigot = request["timingsMaster"]["config"]["spigot"] if "spigot" in request["timingsMaster"]["config"] else None paper = request["timingsMaster"]["config"]["paper"] if "paper" in request["timingsMaster"]["config"] else None + tuinity = request["timingsMaster"]["config"]["tuinity"] if "tuinity" in request["timingsMaster"]["config"] else None purpur = request["timingsMaster"]["config"]["purpur"] if "purpur" in request["timingsMaster"]["config"] else None if not YAML_ERROR: if "plugins" in TIMINGS_CHECK: @@ -178,15 +173,15 @@ class Timings(commands.Cog): stored_plugin["name"] = plugin_name embed_var.add_field(**create_field(stored_plugin)) else: - eval_field(embed_var, stored_plugin, plugin_name, unchecked, plugins, - server_properties, bukkit, spigot, paper, purpur) + eval_field(embed_var, stored_plugin, plugin_name, plugins, + server_properties, bukkit, spigot, paper, tuinity, purpur) if "config" in TIMINGS_CHECK: for config_name in TIMINGS_CHECK["config"]: config = TIMINGS_CHECK["config"][config_name] for option_name in config: option = config[option_name] - eval_field(embed_var, option, option_name, unchecked, plugins, server_properties, bukkit, - spigot, paper, purpur) + eval_field(embed_var, option, option_name, plugins, server_properties, bukkit, + spigot, paper, tuinity, purpur) else: embed_var.add_field(name="Error loading YAML file", value=YAML_ERROR) @@ -206,7 +201,6 @@ class Timings(commands.Cog): value="This plugin was made by Songoda. Songoda resources are poorly developed and often cause problems. You should find an alternative.") except KeyError as key: print("Missing: " + str(key)) - unchecked = unchecked + 1 try: using_ntvd = True @@ -215,16 +209,15 @@ class Timings(commands.Cog): for world in worlds: tvd = int(request_raw["worlds"][world]["ticking-distance"]) ntvd = int(request_raw["worlds"][world]["notick-viewdistance"]) - if ntvd >= tvd >= 4: + if ntvd <= tvd and tvd >= 4: using_ntvd = False - if not using_ntvd and tvd > 3: + if not using_ntvd: embed_var.add_field(name="❌ no-tick-view-distance", value="Set in [paper.yml](http://bit.ly/paperconf). Recommended: " + str( tvd) + ". And reduce view-distance from default (" + str( tvd) + ") in [spigot.yml](http://bit.ly/spiconf). Recommended: 3.") except KeyError as key: print("Missing: " + str(key)) - unchecked = unchecked + 1 try: normal_ticks = request["timingsMaster"]["data"][0]["totalTicks"] @@ -249,7 +242,6 @@ class Timings(commands.Cog): embed_var.color = color except KeyError as key: print("Missing: " + str(key)) - unchecked = unchecked + 1 except ValueError as value_error: print(value_error) @@ -262,9 +254,6 @@ class Timings(commands.Cog): await message.reply(embed=embed_var) return - if unchecked > 0: - embed_var.description = "||" + str(unchecked) + " missing configuration optimizations.||" - issue_count = len(embed_var.fields) field_at_index = 24 if issue_count >= 25: @@ -279,9 +268,9 @@ class Timings(commands.Cog): await message.reply(embed=embed_var) -def eval_field(embed_var, option, option_name, unchecked, plugins, server_properties, bukkit, spigot, paper, purpur): +def eval_field(embed_var, option, option_name, plugins, server_properties, bukkit, spigot, paper, tuinity, purpur): dict_of_vars = {"plugins": plugins, "server_properties": server_properties, "bukkit": bukkit, "spigot": spigot, - "paper": paper, "purpur": purpur} + "paper": paper, "tuinity": tuinity, "purpur": purpur} try: for option_data in option: add_to_field = True @@ -311,12 +300,9 @@ def eval_field(embed_var, option, option_name, unchecked, plugins, server_proper "\\|n\\", "\n") embed_var.add_field(**create_field({**{"name": option_name}, **option_data})) break - else: - unchecked = unchecked + 1 except KeyError as key: print("Missing: " + str(key)) - unchecked += 1 def create_field(option):