From 5d4bec83ba1a393f8487b28499b023b18d3910a8 Mon Sep 17 00:00:00 2001 From: TheAlan404 Date: Wed, 5 Jul 2023 18:17:00 +0300 Subject: [PATCH 1/2] use mcman 0.2.0 --- PLUGINS.md | 6 ++ README.md | 14 +++++ server.toml | 165 +++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 137 insertions(+), 48 deletions(-) create mode 100644 PLUGINS.md create mode 100644 README.md diff --git a/PLUGINS.md b/PLUGINS.md new file mode 100644 index 0000000..7ae5d93 --- /dev/null +++ b/PLUGINS.md @@ -0,0 +1,6 @@ +# Plugins + +[<- Link back to README](./README.md) + + + \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..981d7c6 --- /dev/null +++ b/README.md @@ -0,0 +1,14 @@ +# IPTFreedom + +[![mcman badge](https://img.shields.io/badge/uses-mcman-purple?logo=github)](https://github.com/ParadigmMC/mcman) + + + + +## Plugins + +See [PLUGINS.md](./PLUGINS.md) + +## Building + +See [mcman](https://github.com/ParadigmMC/mcman) docs. diff --git a/server.toml b/server.toml index 9d32661..c2986ca 100644 --- a/server.toml +++ b/server.toml @@ -2,8 +2,11 @@ name = "IPTFreedom" mc_version = "1.20.1" [jar] -type = "url" -url = "https://ci.plex.us.org/job/Scissors/job/1.20.1/lastSuccessfulBuild/artifact/build/libs/scissors-1.20.1-19.jar" +type = "jenkins" +url = "https://ci.plex.us.org" +job = "Scissors/1.20.1" +build = "latest" +artifact = "first" [variables] SERVER_ADDRESS = "ipt.esixtwo.one" @@ -44,20 +47,29 @@ nogui = true memory = "6500M" [[plugins]] -type = "url" -url = "https://github.com/IPTFreedom/TotalFreedomMod/releases/download/2022.06.08-IPT/TotalFreedomMod-2022.06.08-IPT.jar" +type = "ghrel" +repo = "IPTFreedom/TotalFreedomMod" +tag = "2022.06.08-IPT" +asset = "TotalFreedomMod" [[plugins]] -type = "url" -url = "https://github.com/IPTFreedom/Minecraft-JDA/releases/download/5.0.0-beta.10-1/Minecraft-JDA-5.0.0-beta.10-1.jar" +type = "ghrel" +repo = "IPTFreedom/Minecraft-JDA" +tag = "5.0.0-beta.10-1" +asset = "Minecraft-JDA" [[plugins]] type = "url" url = "https://ci.enginehub.org/repository/download/bt11/22205:id/worldguard-bukkit-7.0.9-SNAPSHOT-dist.jar?branch=version/7.0.x&guest=1" +filename = "worldguard-bukkit-7.0.9-SNAPSHOT-dist.jar" +desc = "WorldGuard" [[plugins]] -type = "url" -url = "https://ci.plex.us.org/job/FastAsynchronousIncompetence/36/artifact/worldedit-bukkit/build/libs/FastAsyncWorldEdit-Bukkit-2.6.4-SNAPSHOT-36.jar" +type = "jenkins" +url = "https://ci.plex.us.org" +job = "FastAsynchronousIncompetence" +build = "latest" +artifact = "first" [[plugins]] type = "modrinth" @@ -65,49 +77,71 @@ id = "buildersutilities" version = "usc9dcSx" [[plugins]] -type = "url" -url = "https://github.com/IPTFreedom/BukkitTelnet/releases/download/4.9.3-IPT/bukkittelnet-4.9.3-IPT.jar" +type = "ghrel" +repo = "IPTFreedom/BukkitTelnet" +tag = "4.9.3-IPT" +asset = "bukkittelnet" [[plugins]] -type = "url" -url = "https://github.com/IPTFreedom/Addendum/releases/download/1.0.0/Addendum-1.0.0.jar" +type = "ghrel" +repo = "IPTFreedom/Addendum" +tag = "1.0.0" +asset = "Addendum" [[plugins]] type = "spigot" id = "carz.56255" [[plugins]] -type = "url" -url = "https://github.com/IPTFreedom/ESP/releases/download/1.1/ESP-1.1.jar" +type = "ghrel" +repo = "IPTFreedom/ESP" +tag = "1.1" +asset = "ESP" [[plugins]] -type = "url" -url = "https://github.com/IPTFreedom/TF-EssentialsX/releases/download/2.20.1/EssentialsX-2.20.1-dev+395-92d7f94.jar" +type = "ghrel" +repo = "IPTFreedom/TF-EssentialsX" +tag = "2.20.1" +asset = "EssentialsX" [[plugins]] -type = "url" -url = "https://github.com/IPTFreedom/TF-EssentialsX/releases/download/2.20.1/EssentialsXSpawn-2.20.1-dev+395-92d7f94.jar" +type = "ghrel" +repo = "IPTFreedom/TF-EssentialsX" +tag = "2.20.1" +asset = "EssentialsXSpawn" [[plugins]] -type = "url" -url = "https://github.com/IPTFreedom/EmotesTF/releases/download/1.1/emotestf-1.1.jar" +type = "ghrel" +repo = "IPTFreedom/EmotesTF" +tag = "1.1" +asset = "emotestf" # TODO: Decompile this one and clean up the code & make a release [[plugins]] type = "url" url = "https://cdn.discordapp.com/attachments/1041011669872160769/1116508640480874556/CrackShot-0.99.jar" +filename = "CrackShot-0.99.jar" +desc = "TODO: Decompile this one and clean up the code & make a release" [[plugins]] -type = "url" -url = "https://github.com/IPTFreedom/MarriageMaster/releases/download/2.7.0.2-IPT/MarriageMaster-2.7.0.2-IPT.jar" +type = "ghrel" +repo = "IPTFreedom/MarriageMaster" +tag = "2.7.0.2-IPT" +asset = "MarriageMaster" [[plugins]] -type = "url" -url = "https://ci.pcgamingfreaks.at/job/PluginLib/738/artifact/target/PCGF_PluginLib-1.0.39-SNAPSHOT.jar" +type = "jenkins" +url = "https://ci.pcgamingfreaks.at" +job = "PluginLib" +build = "latest" +artifact = "first" +# TODO(mcman): change when hangar support [[plugins]] type = "url" url = "https://hangarcdn.papermc.io/plugins/Telesphoreo/ItemizerX/versions/2.0/PAPER/ItemizerX.jar" +filename = "ItemizerX.jar" +desc = "TODO(mcman): change when hangar support" [[plugins]] type = "modrinth" @@ -115,49 +149,84 @@ id = "coreprotect" version = "mvLpRWww" [[plugins]] -type = "url" -url = "https://github.com/ViaVersion/ViaVersion/releases/download/4.7.0/ViaVersion-4.7.0.jar" +type = "ghrel" +repo = "ViaVersion/ViaVersion" +tag = "4.7.0" +asset = "ViaVersion" [[plugins]] -type = "url" -url = "https://github.com/ViaVersion/ViaBackwards/releases/download/4.7.0/ViaBackwards-4.7.0.jar" +type = "ghrel" +repo = "ViaVersion/ViaBackwards" +tag = "4.7.0" +asset = "ViaBackwards" [[plugins]] -type = "url" -url = "https://github.com/Jikoo/OpenInv/releases/download/4.3.1/OpenInv.jar" +type = "ghrel" +repo = "Jikoo/OpenInv" +tag = "4.3.1" +asset = "OpenInv.jar" [[plugins]] -type = "url" -url = "https://github.com/IPTFreedom/PlotSquared/releases/download/7.0.0-beta.3-IPT/plotsquared-bukkit-7.0.0-beta.3-IPT.jar" +type = "ghrel" +repo = "IPTFreedom/PlotSquared" +tag = "7.0.0-beta.3-IPT" +asset = "plotsquared-bukkit" [[plugins]] -type = "url" -url = "https://github.com/Gecolay/GSit/releases/download/1.4.7/GSit-1.4.7.jar" +type = "ghrel" +repo = "Gecolay/GSit" +tag = "1.4.7" +asset = "GSit" [[plugins]] -type = "url" -url = "https://ci.codemc.io/job/filoghost/job/HolographicDisplays/258/artifact/HolographicDisplays-3.0.3.jar" +type = "jenkins" +url = "https://ci.codemc.io" +job = "filoghost/HolographicDisplays" +build = "latest" +artifact = "first" [[plugins]] -type = "url" -url = "https://github.com/kikelkik/LiftReloaded/releases/download/2.4.3/lift-reloaded-2.4.3.jar" +type = "ghrel" +repo = "kikelkik/LiftReloaded" +tag = "2.4.3" +asset = "lift-reloaded" [[plugins]] -type = "url" -url = "https://github.com/aromaa/WorldGuardExtraFlags/releases/download/v4.2.1/WorldGuardExtraFlags.jar" +type = "ghrel" +repo = "aromaa/WorldGuardExtraFlags" +tag = "v4.2.1" +asset = "WorldGuardExtraFlags.jar" [[plugins]] -type = "url" -url = "https://ci.md-5.net/job/LibsDisguises/1243/artifact/target/LibsDisguises.jar" +type = "jenkins" +url = "https://ci.md-5.net" +job = "LibsDisguises" +build = "latest" +artifact = "first" [[plugins]] -type = "url" -url = "https://github.com/ayunami2000/LiberalDisguises/releases/download/v1.0.0/liberaldisguises-1.0.0.jar" +type = "ghrel" +repo = "ayunami2000/LiberalDisguises" +tag = "v1.0.0" +asset = "liberaldisguises" [[plugins]] -type = "url" -url = "https://ci.dmulloy2.net/job/ProtocolLib/654/artifact/build/libs/ProtocolLib.jar" +type = "jenkins" +url = "https://ci.dmulloy2.net" +job = "ProtocolLib" +build = "latest" +artifact = "first" [[plugins]] -type = "url" -url = "https://ci.lucko.me/job/spark/384/artifact/spark-bukkit/build/libs/spark-1.10.43-bukkit.jar" +type = "jenkins" +url = "https://ci.lucko.me" +job = "spark" +build = "latest" +artifact = "bukkit" + +[markdown] +files = [ + "README.md", + "PLUGINS.md" +] +auto_update = false From 9fdf33e06fb54f467eeaa622cea1a9a02a320617 Mon Sep 17 00:00:00 2001 From: TheAlan404 Date: Thu, 6 Jul 2023 14:11:46 +0300 Subject: [PATCH 2/2] launcher.properties & mcman md --- PLUGINS.md | 31 +++++++++++++++++++++++++++++++ README.md | 3 +++ server.toml | 5 ++++- 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/PLUGINS.md b/PLUGINS.md index 7ae5d93..b3adff0 100644 --- a/PLUGINS.md +++ b/PLUGINS.md @@ -3,4 +3,35 @@ [<- Link back to README](./README.md) +| Name | Description | Version | +| ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------- | +| [IPTFreedom/TotalFreedomMod](https://github.com/IPTFreedom/TotalFreedomMod) | A server modification for the TotalFreedom server. | 2022.06.08-IPT / `TotalFreedomMod` | +| [IPTFreedom/Minecraft-JDA](https://github.com/IPTFreedom/Minecraft-JDA) | Minecraft plugin version of JDA (It's just a dependency plugin) | 5.0.0-beta.10-1 / `Minecraft-JDA` | +| `worldguard-bukkit-7.0.9-SNAPSHOT-dist.jar` | WorldGuard | [URL](https://ci.enginehub.org/repository/download/bt11/22205:id/worldguard-bukkit-7.0.9-SNAPSHOT-dist.jar?branch=version/7.0.x&guest=1) | +| [FastAsynchronousIncompetence](https://ci.plex.us.org/job/FastAsynchronousIncompetence) | Fixes some of the absolutely awful code behind FastAsyncWorldEdit. | latest / `first` | +| [BuildersUtilities](https://modrinth.com/mod/buildersutilities) | A curated bundle of tiny features that help builders do their thing. | usc9dcSx | +| [IPTFreedom/BukkitTelnet](https://github.com/IPTFreedom/BukkitTelnet) | A crafty telnet server | 4.9.3-IPT / `bukkittelnet` | +| [IPTFreedom/Addendum](https://github.com/IPTFreedom/Addendum) | | 1.0.0 / `Addendum` | +| [Carz](https://www.spigotmc.org/resources/carz.56255) | Drive in Minecraft. | | +| [IPTFreedom/ESP](https://github.com/IPTFreedom/ESP) | Approximated recreation of @VideoGameSmash12's ESP plugin | 1.1 / `ESP` | +| [IPTFreedom/TF-EssentialsX](https://github.com/IPTFreedom/TF-EssentialsX) | EssentialsX - A maintained fork of Essentials 2.x. | 2.20.1 / `EssentialsX` | +| [IPTFreedom/TF-EssentialsX](https://github.com/IPTFreedom/TF-EssentialsX) | EssentialsX - A maintained fork of Essentials 2.x. | 2.20.1 / `EssentialsXSpawn` | +| [IPTFreedom/EmotesTF](https://github.com/IPTFreedom/EmotesTF) | | 1.1 / `emotestf` | +| `CrackShot-0.99.jar` | TODO: Decompile this one and clean up the code & make a release | [URL](https://cdn.discordapp.com/attachments/1041011669872160769/1116508640480874556/CrackShot-0.99.jar) | +| [IPTFreedom/MarriageMaster](https://github.com/IPTFreedom/MarriageMaster) | Marriage Plugin for Bukkit/Spigot | 2.7.0.2-IPT / `MarriageMaster` | +| [PluginLib](https://ci.pcgamingfreaks.at/job/PluginLib) | PCGF PluginLib Used for all PCGF Minecraft plugins. | latest / `first` | +| `ItemizerX.jar` | TODO(mcman): change when hangar support | [URL](https://hangarcdn.papermc.io/plugins/Telesphoreo/ItemizerX/versions/2.0/PAPER/ItemizerX.jar) | +| [CoreProtect](https://modrinth.com/mod/coreprotect) | CoreProtect is a fast, efficient, data logging and anti-griefing tool. Rollback and restore any amount of damage. Designed with large servers in mind, CoreProtect will record and manage data without impacting your server performance. | mvLpRWww | +| [ViaVersion/ViaVersion](https://github.com/ViaVersion/ViaVersion) | Allows the connection of newer clients to older server versions for Minecraft servers. | 4.7.0 / `ViaVersion` | +| [ViaVersion/ViaBackwards](https://github.com/ViaVersion/ViaBackwards) | Allows the connection of older clients to newer server versions for Minecraft servers. | 4.7.0 / `ViaBackwards` | +| [Jikoo/OpenInv](https://github.com/Jikoo/OpenInv) | Open anyone's inventory as a chest, real-time! | 4.3.1 / `OpenInv.jar` | +| [IPTFreedom/PlotSquared](https://github.com/IPTFreedom/PlotSquared) | PlotSquared - Reinventing the plotworld | 7.0.0-beta.3-IPT / `plotsquared-bukkit` | +| [Gecolay/GSit](https://github.com/Gecolay/GSit) | GPlugin - GSit - Relax with other players on nice seats! | 1.4.7 / `GSit` | +| [filoghost/HolographicDisplays](https://ci.codemc.io/job/filoghost/job/HolographicDisplays) | Bukkit Dev Page: dev.bukkit.org/projects/holographic-displays | latest / `first` | +| [kikelkik/LiftReloaded](https://github.com/kikelkik/LiftReloaded) | Simple and easy Lifts and Elevators for Bukkit | 2.4.3 / `lift-reloaded` | +| [aromaa/WorldGuardExtraFlags](https://github.com/aromaa/WorldGuardExtraFlags) | Extension for the WorldGuard plugin. | v4.2.1 / `WorldGuardExtraFlags.jar` | +| [LibsDisguises](https://ci.md-5.net/job/LibsDisguises) | Worst disguise plugin available Disguise plugin created by libraryaddict, previously maintained by byteflux and NavidK0 | latest / `first` | +| [ayunami2000/LiberalDisguises](https://github.com/ayunami2000/LiberalDisguises) | | v1.0.0 / `liberaldisguises` | +| [ProtocolLib](https://ci.dmulloy2.net/job/ProtocolLib) | Here you will find development versions of ProtocolLib. They aren't guaranteed to be stable (although they do pass over 100 unit tests). latest release.--> Currently maintained by dmulloy2. Spigot Resource: https://www.spigotmc.org/resources/protocollib.1997/ Issue Tracker: https://github.com/dmulloy2/ProtocolLib/issues Recommended Versions 5.0.0 for 1.8-1.19.4 You may be able to find legacy versions in the old project | latest / `first` | +| [spark](https://ci.lucko.me/job/spark) | ![spark downloads](https://i.imgur.com/xF8r3Dc.png) More information about spark can be found on [GitHub](https://github.com/lucko/spark). **Bukkit**: download `spark-*-bukkit.jar` and use the command `/spark` to control the plugin. **Fabric**: download `spark-*-fabric.jar` and use the commands `/spark` or `/sparkc` (client-side) to control the mod. **Forge**: download `spark-*-forge.jar` and use the commands `/spark` or `/sparkc` (client-side) to control the mod. **Sponge** (API 6/7): download `spark-*-sponge7.jar` and use the command `/spark` to control the plugin. **Sponge** (API 8): download `spark-*-sponge8.jar` and use the command `/spark` to control the plugin. **Nukkit**: download `spark-*-nukkit.jar` and use the command `/spark` to control the plugin. **BungeeCord**: download `spark-*-bukkit.jar` and use the command `/sparkb` to control the plugin. **Velocity** (v3.x): download `spark-*-velocity.jar` and use the command `/sparkv` to control the plugin. **Velocity** (v4.x): download `spark-*-velocity4.jar` and use the command `/sparkv` to control the plugin. **Waterdog**: download `spark-*-waterdog.jar` and use the command `/sparkw` to control the plugin. **Minestom**: download `spark-*-minestom.jar` and use the command `/spark` to control the plugin. The builds on this page are for the latest Minecraft versions supported by each platform. | latest / `bukkit` | \ No newline at end of file diff --git a/README.md b/README.md index 981d7c6..196d09c 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,9 @@ [![mcman badge](https://img.shields.io/badge/uses-mcman-purple?logo=github)](https://github.com/ParadigmMC/mcman) +| Version | Type | Build | +| ------- | ----------------------------------------------------------------- | -------- | +| 1.20.1 | [Scissors/1.20.1](https://ci.plex.us.org/job/Scissors/job/1.20.1) | *Latest* | ## Plugins diff --git a/server.toml b/server.toml index c2986ca..279f49b 100644 --- a/server.toml +++ b/server.toml @@ -40,12 +40,15 @@ DISCORD_ROLE_ID_EXECUTIVE = "" DISCORD_ROLE_ID_SERVER_OWNER = "" [launcher] -jvm_args = "-XX:+ExitOnOutOfMemoryError -Dcom.github.iptfreedom.fastasynchronousincompetence.allowv7=true" +jvm_args = "-XX:+ExitOnOutOfMemoryError" aikars_flags = true eula_args = true nogui = true memory = "6500M" +[launcher.properties] +"com.github.iptfreedom.fastasynchronousincompetence.allowv7" = "true" + [[plugins]] type = "ghrel" repo = "IPTFreedom/TotalFreedomMod"