Merge pull request #186 from PrisonTeam/bleeding_pull_v3_2_4

Bleeding pull v3 2 4
PrisonTeam · Mar 1, 2021 · b6684ee · b6684ee
2 parents 108ad60 + 299de1a
commit b6684ee
Show file tree

Hide file tree

Showing 242 changed files with 19,798 additions and 4,999 deletions.
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: "gradle"
+    # path to build.gradle
+    directory: "/prison-spigot"
+    schedule:
+      interval: "daily"
diff --git a/PrisonSpigotMC.bbcode.txt b/PrisonSpigotMC.bbcode.txt
diff --git a/PrisonSpigotMC/Images/Features_01.PNG b/PrisonSpigotMC/Images/Features_01.PNG
diff --git a/PrisonSpigotMC/Images/Guidebooks_02.PNG b/PrisonSpigotMC/Images/Guidebooks_02.PNG
diff --git a/PrisonSpigotMC/Images/Prison_Banner_youtube.png b/PrisonSpigotMC/Images/Prison_Banner_youtube.png
diff --git a/PrisonSpigotMC/Images/Prison_Commands_01.png b/PrisonSpigotMC/Images/Prison_Commands_01.png
diff --git a/PrisonSpigotMC/Images/Prison_Commands_02.png b/PrisonSpigotMC/Images/Prison_Commands_02.png
diff --git a/PrisonSpigotMC/Images/Prison_Logo.png b/PrisonSpigotMC/Images/Prison_Logo.png
diff --git a/PrisonSpigotMC/Images/Prison_Logo_Small.png b/PrisonSpigotMC/Images/Prison_Logo_Small.png
diff --git a/PrisonSpigotMC/Images/Prison_watermark.png b/PrisonSpigotMC/Images/Prison_watermark.png
diff --git a/PrisonSpigotMC/Images/Prison_watermark_20.png b/PrisonSpigotMC/Images/Prison_watermark_20.png
diff --git a/PrisonSpigotMC/Images/Prison_watermark_40.png b/PrisonSpigotMC/Images/Prison_watermark_40.png
diff --git a/PrisonSpigotMC/Images/Prison_watermark_60.png b/PrisonSpigotMC/Images/Prison_watermark_60.png
diff --git a/PrisonSpigotMC/Images/Prison_watermark_80.png b/PrisonSpigotMC/Images/Prison_watermark_80.png
diff --git a/PrisonSpigotMC/Images/Sectional Header Prison Long.png b/PrisonSpigotMC/Images/Sectional Header Prison Long.png
diff --git a/PrisonSpigotMC/Images/Sectional Header Prison.png b/PrisonSpigotMC/Images/Sectional Header Prison.png
diff --git a/PrisonSpigotMC/Images/Sectional Subheader AutoBlock Long.png b/PrisonSpigotMC/Images/Sectional Subheader AutoBlock Long.png
diff --git a/PrisonSpigotMC/Images/Sectional Subheader AutoFeatures Long.png b/PrisonSpigotMC/Images/Sectional Subheader AutoFeatures Long.png
diff --git a/PrisonSpigotMC/Images/Sectional Subheader AutoPickup Long.png b/PrisonSpigotMC/Images/Sectional Subheader AutoPickup Long.png
diff --git a/PrisonSpigotMC/Images/Sectional Subheader AutoSell Long.png b/PrisonSpigotMC/Images/Sectional Subheader AutoSell Long.png
diff --git a/PrisonSpigotMC/Images/Sectional Subheader AutoSmelt Long.png b/PrisonSpigotMC/Images/Sectional Subheader AutoSmelt Long.png
diff --git a/PrisonSpigotMC/Images/Sectional Subheader Backpacks Long.png b/PrisonSpigotMC/Images/Sectional Subheader Backpacks Long.png
diff --git a/PrisonSpigotMC/Images/Sectional Subheader Backpacks.png b/PrisonSpigotMC/Images/Sectional Subheader Backpacks.png
diff --git a/PrisonSpigotMC/Images/Sectional Subheader Core Features Long.png b/PrisonSpigotMC/Images/Sectional Subheader Core Features Long.png
diff --git a/PrisonSpigotMC/Images/Sectional Subheader Core Features.png b/PrisonSpigotMC/Images/Sectional Subheader Core Features.png
diff --git a/PrisonSpigotMC/Images/Sectional Subheader Custom Items Long.png b/PrisonSpigotMC/Images/Sectional Subheader Custom Items Long.png
diff --git a/PrisonSpigotMC/Images/Sectional Subheader Dependencies Long.png b/PrisonSpigotMC/Images/Sectional Subheader Dependencies Long.png
diff --git a/PrisonSpigotMC/Images/Sectional Subheader Main Commands Long.png b/PrisonSpigotMC/Images/Sectional Subheader Main Commands Long.png
diff --git a/PrisonSpigotMC/Images/Sectional Subheader Main Commands.png b/PrisonSpigotMC/Images/Sectional Subheader Main Commands.png
diff --git a/PrisonSpigotMC/Images/Sectional Subheader Mines Long.png b/PrisonSpigotMC/Images/Sectional Subheader Mines Long.png
diff --git a/PrisonSpigotMC/Images/Sectional Subheader Mines.png b/PrisonSpigotMC/Images/Sectional Subheader Mines.png
diff --git a/PrisonSpigotMC/Images/Sectional Subheader Placeholders Long.png b/PrisonSpigotMC/Images/Sectional Subheader Placeholders Long.png
diff --git a/PrisonSpigotMC/Images/Sectional Subheader Ranks Long.png b/PrisonSpigotMC/Images/Sectional Subheader Ranks Long.png
diff --git a/PrisonSpigotMC/Images/Sectional Subheader Ranks.png b/PrisonSpigotMC/Images/Sectional Subheader Ranks.png
diff --git a/PrisonSpigotMC/Images/Sectional Subheader SellAll Long.png b/PrisonSpigotMC/Images/Sectional Subheader SellAll Long.png
diff --git a/PrisonSpigotMC/Images/Sectional Subheader Supported Plugins Long.png b/PrisonSpigotMC/Images/Sectional Subheader Supported Plugins Long.png
diff --git a/PrisonSpigotMC/Images/Sectional Subheader Useful Links Long.png b/PrisonSpigotMC/Images/Sectional Subheader Useful Links Long.png
diff --git a/PrisonSpigotMC/Images/What'sPrison_03.PNG b/PrisonSpigotMC/Images/What'sPrison_03.PNG
diff --git a/PrisonSpigotMC/PrisonSpigotMC.bbcode.txt b/PrisonSpigotMC/PrisonSpigotMC.bbcode.txt
diff --git a/PrisonSpigotMC/README_bbcode.md b/PrisonSpigotMC/README_bbcode.md
@@ -0,0 +1,63 @@
+This pertains to the bbcode that is within this directory:
+
+
+The targeted editor is the bbcode editor on the spigotmc.org site.  It is recognized that most people will not have access to the editor.  In order to use it, or have access to the editor, a resource needs to be edited.  If such an editor cannot be used, then the following may be a substitution but strictly follow the guidelines.
+
+
+
+
+If you are unable to have access to a spigotmc.org editor, then the following could be used, but with caution.  Use at your own risk, but it can be a reasonable fall-back.
+
+The following editor works and will show how the page will render (mostly), but the images are not properly sized, when compared to spigotmc.org.  This is good for editing text, but do not use this editor to format any images; keep the image sizes the way they are.  It probably is also a good idea not to use this editor for tweaking sizes or spaces either, since minor things like that may render differently on spigotmc.org too.  
+https://www.sceditor.com/
+
+
+
+The following is an example of an online bb editor that does not work since it is unable parse all of the codes:
+https://www.systutorials.com/tools/bbeditor/
+
+
+<hr style="height:5px; border:none; color:#aaf; background-color:#aaf;">
+
+
+## Sites that need to be updated
+
+
+### spigotmc.org
+  https://www.spigotmc.org/resources/prison.1223/
+
+The bbcode is designed and targeted for spigotmc.org so this should work the best.  I find that some things are best modified by hand instead of using their editor so you have better control over the items being changed since nesting can get somewhat deep.
+
+
+<hr style="height:1px; border:none; color:#aaf; background-color:#aaf;">
+
+
+
+### Polymart.org
+https://polymart.org/resource/prison-1-8-x-1-16-5.678
+
+Polymart.org also uses bbcode, but it's not exactly the same.  There were two major problems.
+
+First the bbedit tag [list] is displayed on spigotmc.org as an unordered list.  But on Polymart it is shown as an ordered list.  For some reason, by going in and out of the editor, and perhaps adding a line feed here or there, Polymart converted it back to an unordered list.  Polymart is unable to decode [list=1] so I just converted it back to a plain [list].
+
+
+Secondly, the most severe issue was with the [img] tags.  They are structured properly, but they would not render correctly.  They would show the full bbedit [img ...] statement, minus the first four characters of "[img]".  Going back in to the source thy appeared correct.  Not really sure what fixed it, but by putting [img] on a new line and removing the alt attribute, they were able to render correctly, although the code was identical in all other ways.
+
+<hr style="height:1px; border:none; color:#aaf; background-color:#aaf;">
+
+
+
+### bukkit.org, curseforge.com, twitch
+
+Twitch owns bukkit.org and curseforge.com and those two sites are linked together: publish to one site, and it appears on the other.  I publish to bukkit.com.
+
+https://dev.bukkit.org/projects/mc-prison-v3
+https://www.curseforge.com/minecraft/bukkit-plugins/mc-prison-v3
+
+
+This site does not use bbedit codes.  What it does use is html.  
+
+To get the "translated" html from the bbedit codes, I opened spigotmc.org within firefox's developer's tools to inspect the container that help the html code.  I copied all of it and pasted it in to the editor in bukkit after enabling the code view of the editor.  I kept the initial content.  It worked fine without having to tweak anything after that. It may not be a perfect rendition since it does not carry over the css that is used within spigotmc.org, but it's not bad overall. It is not worth trying to get the css working better (you can't change it anyway). 
+
+
+<hr style="height:1px; border:none; color:#aaf; background-color:#aaf;">
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 [![License](https://img.shields.io/badge/license-GPL%20License%20v3-blue.svg)](LICENSE.md)
+[![Build Status](https://github.com/PrisonTeam/Prison/workflows/Prison%20Build/badge.svg)](https://github.com/PrisonTeam/Prison/actions?query=workflow%3A%22Prison+Build%22)
 [![Build Status](https://travis-ci.org/MC-Prison/Prison.svg?branch=master)](https://travis-ci.org/MC-Prison/Prison)
 [![Discord](https://discordapp.com/api/guilds/332602419483770890/widget.png)](https://discord.gg/DCJ3j6r)