Merge branch 'master' into master

DieReicheErethons · Jun 15, 2021 · 54a371c · 54a371c
2 parents 5da3933 + d4af104
commit 54a371c
Show file tree

Hide file tree

Showing 39 changed files with 1,134 additions and 206 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -1,14 +1,22 @@
 ### Brewery is a Minecraft-Plugin for an alternate brewing process, including alcoholic Potions.
 
 [![Build Status](https://travis-ci.org/DieReicheErethons/Brewery.png?branch=master)](https://travis-ci.org/DieReicheErethons/Brewery)
+![License: GPLv3](https://img.shields.io/badge/license-GPLv3-blue)
+[![Releases](https://img.shields.io/github/v/release/DieReicheErethons/Brewery)](https://github.com/DieReicheErethons/Brewery/releases/latest)
 
 ***
 
-Find the Project Page on [Spigot](https://www.spigotmc.org/resources/brewery.3082/) or [Bukkit](https://dev.bukkit.org/projects/brewery)
+###Find the Project Page on [Spigot](https://www.spigotmc.org/resources/brewery.3082/) or [Bukkit](https://dev.bukkit.org/projects/brewery)
 
-Also see  [Wiki](https://github.com/DieReicheErethons/Brewery/wiki) | [Releases](https://github.com/DieReicheErethons/Brewery/releases) | [Changelog](https://github.com/DieReicheErethons/Brewery/wiki/changelog) | [Commits](https://github.com/DieReicheErethons/Brewery/commits/master)
+###Also see  [Wiki](https://github.com/DieReicheErethons/Brewery/wiki) | [Releases](https://github.com/DieReicheErethons/Brewery/releases) | [Changelog](https://github.com/DieReicheErethons/Brewery/wiki/changelog) | [Commits](https://github.com/DieReicheErethons/Brewery/commits/master)
 
 
+***
+
+### JavaDocs
+
+[JavaDocs on Jitpack](https://javadoc.jitpack.io/com/github/DieReicheErethons/Brewery/-3166f8c81b-1/javadoc/index.html)
+
 ### Maven
 
 ```XML
@@ -25,3 +33,8 @@ Also see  [Wiki](https://github.com/DieReicheErethons/Brewery/wiki) | [Releases]
 </dependency>
 ```
 _For older maven releases see [here](https://github.com/DieReicheErethons/Brewery/blob/v2.1.2/README.md)_
+
+
+### License
+
+This Project is licensed under GPLv3
diff --git a/pom.xml b/pom.xml
@@ -56,13 +56,13 @@
 						<configuration>
 							<artifactSet>
 								<includes>
-									<include>org.bstats:bstats-bukkit</include>
+									<include>org.bstats:*</include>
 								</includes>
 							</artifactSet>
 							<relocations>
 								<relocation>
-									<pattern>org.bstats.bukkit</pattern>
-									<shadedPattern>com.dre.brewery.integration</shadedPattern>
+									<pattern>org.bstats</pattern>
+									<shadedPattern>com.dre.brewery.integration.bstats</shadedPattern>
 								</relocation>
 							</relocations>
 						</configuration>
@@ -76,7 +76,7 @@
 				<version>3.2.0</version>
 				<executions>
 					<execution>
-						<phase>install</phase>
+						<phase>compile</phase>
 						<goals>
 							<goal>jar</goal>
 						</goals>
@@ -98,19 +98,20 @@
 	<repositories>
 		<repository>
 			<id>md_5-public</id>
-			<url>http://repo.md-5.net/content/groups/public/</url>
+			<url>https://repo.md-5.net/content/groups/public/</url>
 		</repository>
 		<repository>
 			<id>spigot-repo</id>
 			<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
 		</repository>
 		<repository>
 			<id>vault-repo</id>
-			<url>http://nexus.hc.to/content/repositories/pub_releases</url>
+			<url>https://nexus.hc.to/content/repositories/pub_releases</url>
 		</repository>
 		<repository>
+			<!-- WorldEdit, WorldGuard -->
 			<id>sk89q-repo</id>
-			<url>http://maven.sk89q.com/repo/</url>
+			<url>https://maven.sk89q.com/repo/</url>
 		</repository>
 		<repository>
 			<!-- GriefPrevention, SlimeFun, Towny, Brewery -->
@@ -126,13 +127,13 @@
 			<id>chestshop-repo</id>
 			<url>https://repo.minebench.de/</url>
 		</repository>
+        <repository>
+            <!-- BlockLocker -->
+            <id>CodeMC</id>
+            <url>https://repo.codemc.org/repository/maven-public</url>
+        </repository>
 		<repository>
-			<!-- bStats -->
-			<id>CodeMC</id>
-			<url>https://repo.codemc.org/repository/maven-public</url>
-		</repository>
-		<repository>
-			<!-- MMOLib -->
+			<!-- MythicLib (MMOItems) -->
 			<id>MMOPlugins</id>
 			<url>https://mvn.lumine.io/repository/maven-releases/</url>
 		</repository>
@@ -147,7 +148,7 @@
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.16.4-R0.1-SNAPSHOT</version>
+			<version>1.17-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 			<exclusions>
 				<exclusion>
@@ -160,11 +161,24 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<!-- https://bstats.org/getting-started/include-metrics -->
+			<groupId>org.bstats</groupId>
+			<artifactId>bstats-bukkit</artifactId>
+			<version>2.2.1</version>
+			<scope>compile</scope>
+		</dependency>
 		<dependency>
 			<groupId>net.milkbowl.vault</groupId>
 			<artifactId>VaultAPI</artifactId>
 			<version>1.6</version>
 			<scope>provided</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>*</artifactId>
+					<groupId>*</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.sk89q</groupId>
@@ -179,9 +193,10 @@
 			</exclusions>
 		</dependency>
 		<dependency>
+			<!-- https://dev.bukkit.org/projects/worldedit/files  -->
 			<groupId>com.sk89q.worldedit</groupId>
 			<artifactId>worldedit-bukkit</artifactId>
-			<version>7.2.0-SNAPSHOT</version>
+			<version>7.2.5</version>
 			<scope>provided</scope>
 			<exclusions>
 				<exclusion>
@@ -193,7 +208,7 @@
 		<dependency>
 			<groupId>com.sk89q.worldedit</groupId>
 			<artifactId>worldedit-core</artifactId>
-			<version>7.2.0-SNAPSHOT</version>
+			<version>7.2.5</version>
 			<scope>provided</scope>
 			<exclusions>
 				<exclusion>
@@ -203,6 +218,7 @@
 			</exclusions>
 		</dependency>
 		<dependency>
+			<!-- https://dev.bukkit.org/projects/worldguard/files -->
 			<groupId>com.sk89q.worldguard</groupId>
 			<artifactId>worldguard-core</artifactId>
 			<version>7.0.4</version>
@@ -215,21 +231,30 @@
 			</exclusions>
 		</dependency>
 		<dependency>
+			<!-- https://www.spigotmc.org/resources/lwc-extended.69551/history -->
 			<groupId>com.griefcraft.lwc</groupId>
 			<artifactId>LWCX</artifactId>
 			<version>2.2.6</version>
 			<scope>provided</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>*</artifactId>
+					<groupId>*</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
+			<!-- https://www.spigotmc.org/resources/griefprevention.1884/history -->
 			<groupId>com.github.TechFortress</groupId>
 			<artifactId>GriefPrevention</artifactId>
-			<version>16.16.0</version>
+			<version>16.17.1</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
+			<!-- https://www.spigotmc.org/resources/logblock.67333/history -->
 			<groupId>de.diddiz</groupId>
 			<artifactId>logblock</artifactId>
-			<version>1.16.1.1</version>
+			<version>1.16.5.1</version>
 			<scope>provided</scope>
 			<exclusions>
 				<exclusion>
@@ -239,9 +264,10 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>com.github.TheBusyBiscuit</groupId>
+			<!-- https://github.com/Slimefun/Slimefun4/releases -->
+			<groupId>com.github.slimefun</groupId>
 			<artifactId>Slimefun4</artifactId>
-			<version>RC-17</version>
+			<version>RC-24</version>
 			<scope>provided</scope>
 		</dependency>
 		<!--<dependency>
@@ -252,42 +278,42 @@
 			<scope>provided</scope>
 		</dependency>-->
 		<dependency>
-			<groupId>net.Indyuce</groupId>
-			<artifactId>MMOLib</artifactId>
-			<version>1.4.0</version>
+			<!-- https://mythiccraft.io/index.php?pages/official-mythiclib-dev/ -->
+			<groupId>io.lumine</groupId>
+			<artifactId>MythicLib</artifactId>
+			<version>1.0.19</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
+			<!-- https://github.com/ChestShop-authors/ChestShop-3/releases -->
 			<groupId>com.acrobot.chestshop</groupId>
 			<artifactId>chestshop</artifactId>
-			<version>3.11</version>
+			<version>3.12</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
+			<!-- https://www.spigotmc.org/resources/towny-advanced.72694/history -->
 			<groupId>com.github.TownyAdvanced</groupId>
 			<artifactId>Towny</artifactId>
-			<version>0.96.3.0</version>
+			<version>0.97.0.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
+			<!-- https://www.spigotmc.org/resources/shopkeepers.80756/history -->
 			<groupId>com.nisovin.shopkeepers</groupId>
 			<artifactId>ShopkeepersAPI</artifactId>
 			<version>2.12.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
+			<!-- https://www.spigotmc.org/resources/blocklocker.3268/history -->
 			<groupId>nl.rutgerkok</groupId>
 			<artifactId>blocklocker</artifactId>
-			<version>1.9</version>
+			<version>1.9.2</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.bstats</groupId>
-			<artifactId>bstats-bukkit</artifactId>
-			<version>1.5</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
+			<!-- https://www.jetbrains.com/help/idea/annotating-source-code.html -->
 			<groupId>org.jetbrains</groupId>
 			<artifactId>annotations</artifactId>
 			<version>16.0.2</version>

diff --git a/resources/config/v12/de/config.yml b/resources/config/v12/de/config.yml
@@ -440,6 +440,7 @@ recipes:
       cookingtime: 2
       color: BLACK
       difficulty: 3
+      alcohol: -6
       lore: + &8Bestimmt schon eine Woche alt
       effects:
       - REGENERATION/1/2-5
@@ -509,6 +510,9 @@ openLargeBarrelEverywhere: true
 # Ob nur ein Minimum an Kessel-Partikeln dargestellt werden sollen [false]
 minimalParticles: false
 
+# Ob das Entleeren von Brewery Tränken mit Hilfe von Trichtern möglich ist, um die Glasflasche zurück zu bekommen [true]
+brewHopperDump: true
+
 
 # -- Chat Veränderungs Einstellungen --
 

diff --git a/resources/config/v12/en/config.yml b/resources/config/v12/en/config.yml
@@ -442,6 +442,7 @@ recipes:
       cookingtime: 2
       color: BLACK
       difficulty: 3
+      alcohol: -6
       lore: + &8Probably a week old
       effects:
       - REGENERATION/1/2-5
@@ -510,6 +511,9 @@ openLargeBarrelEverywhere: true
 # If Cauldron Particles should be reduced to the bare minimum [false]
 minimalParticles: false
 
+# Allow emptying brews into hoppers to discard brews while keeping the glass bottle [true]
+brewHopperDump: true
+
 
 # -- Chat Distortion Settings --
 

diff --git a/resources/config/v12/fr/config.yml b/resources/config/v12/fr/config.yml
@@ -438,6 +438,7 @@ recipes:
       cookingtime: 2
       color: BLACK
       difficulty: 3
+      alcohol: -6
       effects:
       - REGENERATION/1/2-5
       - SPEED/1/30-140
@@ -505,6 +506,9 @@ openLargeBarrelEverywhere: true
 # If Cauldron Particles should be reduced to the bare minimum [false]
 minimalParticles: false
 
+# Allow emptying brews into hoppers to discard brews while keeping the glass bottle [true]
+brewHopperDump: true
+
 
 # -- Paramètres de la distorsion du Chat --
 

diff --git a/resources/config/v12/it/config.yml b/resources/config/v12/it/config.yml
@@ -429,6 +429,7 @@ recipes:
       cookingtime: 2
       color: BLACK
       difficulty: 3
+      alcohol: -6
       effects:
       - REGENERATION/1/2-5
       - SPEED/1/30-140
@@ -497,6 +498,9 @@ openLargeBarrelEverywhere: true
 # If Cauldron Particles should be reduced to the bare minimum [false]
 minimalParticles: false
 
+# Allow emptying brews into hoppers to discard brews while keeping the glass bottle [true]
+brewHopperDump: true
+
 
 # -- Imostazioni di distorsione della chat --
 

diff --git a/resources/config/v13/de/config.yml b/resources/config/v13/de/config.yml
@@ -740,6 +740,7 @@ recipes:
     cookingtime: 2
     color: BLACK
     difficulty: 3
+    alcohol: -6
     lore: + &8Bestimmt schon eine Woche alt
     effects:
       - REGENERATION/1/2-5
@@ -821,6 +822,7 @@ recipes:
   #   cookingtime: 1
   #   color: BLACK
   #   difficulty: 4
+  #   alcohol: -8
   #   effects:
   #     - REGENERATION/30
   #     - SPEED/10
@@ -843,7 +845,7 @@ recipes:
 # Pumpkin Spice Bier,
 # Melonen Vodka
 
-# Es gibt noch viele Minecraft Items wie Ranken und items von anderen plugins die sich gut als Zutaten machen würden
+# Es gibt noch viele Minecraft Items wie Ranken, Milch und items von anderen plugins die sich gut als Zutaten machen würden
 
 
 
@@ -906,6 +908,9 @@ openLargeBarrelEverywhere: true
 # Ob nur ein Minimum an Kessel-Partikeln dargestellt werden sollen [false]
 minimalParticles: false
 
+# Ob das Entleeren von Brewery Tränken mit Hilfe von Trichtern möglich ist, um die Glasflasche zurück zu bekommen [true]
+brewHopperDump: true
+
 
 # -- Chat Veränderungs Einstellungen --