Customizable plugin prefix and RGB support in strings

.gitignore

@@ -8,7 +8,7 @@
 /build.xml
 
 # vim
-.*.sw[a-p]
+.*.sw[a-breweryPlugin]
 
 # IntelliJ
 /.idea

README.md

@@ -1,3 +1,13 @@
+# BreweryX
+### This is a fork of the original Brewery plugin to add features and give support to Brewery
+
+Need help, have a feature request, or found a bug? Join the discord [here](https://discord.gg/aV5Am7uxWr)!
+
+
+
+
+# Old ReadME:
+
 ### Brewery is a Minecraft-Plugin for an alternate brewing process, including alcoholic Potions.
 
 [![Build Status](https://github.com/DieReicheErethons/Brewery/actions/workflows/maven.yml/badge.svg)](https://github.com/DieReicheErethons/Brewery/actions/workflows/maven.yml)
@@ -15,7 +25,7 @@
 
 ### JavaDocs
 
-[JavaDocs on Jitpack](https://javadoc.jitpack.io/com/github/DieReicheErethons/Brewery/3.1.1/javadoc/index.html)
+[JavaDocs on Jitpack](https://javadoc.jitpack.io/com/github/DieReicheErethons/Brewery/3.1.1/javadoc/index.html) (Old, new ones coming soon + wiki)
 
 ### Maven
 

pom.xml

@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.dre</groupId>
-	<artifactId>Brewery</artifactId>
-	<version>3.1.1</version>
-	<name>Brewery</name>
+	<artifactId>BreweryX</artifactId>
+	<version>3.1.9</version>
+	<name>BreweryX</name>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -58,13 +58,18 @@
 							<artifactSet>
 								<includes>
 									<include>org.bstats:*</include>
+									<include>com.github.Anon8281:*</include>
 								</includes>
 							</artifactSet>
 							<relocations>
 								<relocation>
 									<pattern>org.bstats</pattern>
 									<shadedPattern>com.dre.brewery.integration.bstats</shadedPattern>
 								</relocation>
+								<relocation>
+									<pattern>com.github.Anon8281.universalScheduler</pattern>
+									<shadedPattern>com.dre.brewery.integration.universalScheduler</shadedPattern>
+								</relocation>
 							</relocations>
 						</configuration>
 					</execution>
@@ -96,6 +101,11 @@
 		</plugins>
 	</build>
 	<repositories>
+		<repository>
+			<!-- GriefPrevention, SlimeFun, Towny, Brewery -->
+			<id>jitpack.io</id>
+			<url>https://jitpack.io</url>
+		</repository>
 		<repository>
 			<id>md_5-public</id>
 			<url>https://repo.md-5.net/content/groups/public/</url>
@@ -113,11 +123,6 @@
 			<id>enginehub-maven</id>
 			<url>https://maven.enginehub.org/repo/</url>
 		</repository>
-		<repository>
-			<!-- GriefPrevention, SlimeFun, Towny, Brewery -->
-			<id>jitpack.io</id>
-			<url>https://jitpack.io</url>
-		</repository>
 		<repository>
 			<!-- LWC Extended -->
 			<id>ender-repo</id>
@@ -142,7 +147,6 @@
 			<id>Lichtspiele</id>
 			<url>https://nexus.lichtspiele.org/repository/releases/</url>
 		</repository>
-
 	</repositories>
 
 	<dependencies>
@@ -248,7 +252,7 @@
 			<!-- https://www.spigotmc.org/resources/griefprevention.1884/history -->
 			<groupId>com.github.TechFortress</groupId>
 			<artifactId>GriefPrevention</artifactId>
-			<version>16.18.1</version>
+			<version>16.18</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -296,7 +300,7 @@
 			<!-- https://www.spigotmc.org/resources/towny-advanced.72694/history -->
 			<groupId>com.github.TownyAdvanced</groupId>
 			<artifactId>Towny</artifactId>
-			<version>0.100.0.0</version>
+			<version>0.100.1.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -320,5 +324,11 @@
 			<version>16.0.2</version>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.github.Anon8281</groupId>
+			<artifactId>UniversalScheduler</artifactId>
+			<version>0.1.3</version>
+			<scope>compile</scope>
+		</dependency>
 	</dependencies>
 </project>

resources/config/v12/de/config.yml

@@ -7,6 +7,9 @@
 # Sprachedatei die genutzt werden sollte (befindet sich in plugins/Brewery/languages)
 language: de
 
+# Prefix used on messages
+pluginPrefix: '&2[Brewery]&f '
+
 # Ob der Spieler beim nächsten Einloggen nach starker Trunkenheit am nächsten morgen Zuhause "aufwacht" (Ein home Plugin muss installiert sein!) [true]
 enableHome: true
 
@@ -32,7 +35,7 @@ enableKickOnOverdrink: false
 enablePuke: true
 
 # Item das beim Erbrechen mehrfach unaufsammelbar fallen gelassen wird [SOUL_SAND]
-pukeItem: SOUL_SAND
+pukeItem: [SOUL_SAND]
 
 # Zeit in Sekunden bis die pukeitems despawnen, (mc standard wäre 300 = 5 min) [60]
 # Wurde die item Despawnzeit in der spigot.yml verändert, verändert sich auch die pukeDespawnzeit in Abhängigkeit.
@@ -65,6 +68,9 @@ alwaysShowQuality: true
 # Ob in den Iteminformationen immer der Alkoholgehalt angezeigt weden soll, oder nur im Braustand [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # Ob das reifen in -Minecraft- Fässern aktiviert ist und wie viele Brewery Getränke in die diese getan werden können [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6

resources/config/v12/en/config.yml

@@ -7,6 +7,9 @@
 # Languagefile to be used (found in plugins/Brewery/languages)
 language: en
 
+# Prefix used on messages
+pluginPrefix: '&2[Brewery]&f '
+
 # If the player wakes up at /home when logging in after excessive drinking (/home plugin must be installed!) [true]
 enableHome: true
 
@@ -32,7 +35,7 @@ enableKickOnOverdrink: false
 enablePuke: true
 
 # Item that is dropped multiple times uncollectable when puking [SOUL_SAND]
-pukeItem: SOUL_SAND
+pukeItem: [SOUL_SAND]
 
 # Time in seconds until the pukeitems despawn, (mc default is 300 = 5 min) [60]
 # If the item despawn time was changed in the spigot.yml, the pukeDespawntime changes as well.
@@ -65,6 +68,9 @@ alwaysShowQuality: true
 # Always show the alcohol content on the item. If false, it will only show in the brewing stand [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # If aging in -Minecraft- Barrels in enabled [true] and how many Brewery drinks can be put into them [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6
@@ -126,6 +132,7 @@ customItems:
     name: '&cRaspberry'
 
 
+
 # -- Ingredients in the Cauldron --
 # Which Ingredients are accepted by the Cauldron and the base potion resulting from them
 # You only need to add something here if you want to specify a custom name or color for the base potion

resources/config/v12/fr/config.yml

@@ -8,6 +8,9 @@
 # Fichier de langage utilisé (trouvable dans plugins/Brewery/languages)
 language: fr
 
+# Prefix used on messages
+pluginPrefix: '&2[Brewery]&f '
+
 # Si le joueur se réveille à son /home lors de sa connexion après un excès alcool (Un plugin de /home est nécessaire!) [true]
 enableHome: true
 
@@ -33,7 +36,7 @@ enableKickOnOverdrink: false
 enablePuke: true
 
 # L'objet utilisé pour représenter le vomit [SOUL_SAND]
-pukeItem: SOUL_SAND
+pukeItem: [SOUL_SAND]
 
 # Time in seconds until the pukeitems despawn, (mc default is 300 = 5 min) [60]
 # If the item despawn time was changed in the spigot.yml, the pukeDespawntime changes as well.
@@ -66,6 +69,9 @@ alwaysShowQuality: true
 # Toujours indiquer la teneur en alcool sur les objets. S'il est false, il n'apparaîtra que dans le stand de brassage. [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # Combien de boissons de brasserie peuvent être mises dans les barils -Minecraft- [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6

resources/config/v12/it/config.yml

@@ -7,6 +7,9 @@
 # Lingua da usare (fra quelle in plugins/Brewery/languages)
 language: it
 
+# Prefix used on messages
+pluginPrefix: '&2[Brewery]&f '
+
 # Se il giocatore si sveglia nella sua /home dopo aver bevuto troppo(il plugin di /home deve essere installato!) [true]
 enableHome: true
 
@@ -32,7 +35,7 @@ enableKickOnOverdrink: false
 enablePuke: true
 
 # L'oggetto droppato in massa quando si vomita che dovrebbe rappresentare il vomito [SOUL_SAND]
-pukeItem: SOUL_SAND
+pukeItem: [SOUL_SAND]
 
 # Tempo in secondi perché il vomito sparisca (il valore di minecraft di default è 300 = 5 min) [60]
 # Se il tempo di scomparsa viene cambiato in spigot.yml anche pukeDespawntime cambia.
@@ -65,6 +68,9 @@ alwaysShowQuality: true
 # Always show the alcohol content on the item. If false, it will only show in the brewing stand [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # If aging in -Minecraft- Barrels in enabled [true] and how many Brewery drinks can be put into them [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6

resources/config/v13/de/config.yml

@@ -7,6 +7,9 @@
 # Sprachedatei die genutzt werden sollte (befindet sich in plugins/Brewery/languages)
 language: de
 
+# Prefix used on messages
+pluginPrefix: '&2[Brewery]&f '
+
 # Ob der Spieler beim nächsten Einloggen nach starker Trunkenheit am nächsten morgen Zuhause "aufwacht" (Ein home Plugin muss installiert sein!) [true]
 enableHome: true
 
@@ -32,7 +35,7 @@ enableKickOnOverdrink: false
 enablePuke: true
 
 # Item das beim Erbrechen mehrfach unaufsammelbar fallen gelassen wird [Soul_Sand]
-pukeItem: Soul_Sand
+pukeItem: [Soul_Sand]
 
 # Zeit in Sekunden bis die pukeitems despawnen, (mc standard wäre 300 = 5 min) [60]
 # Wurde die item Despawnzeit in der spigot.yml verändert, verändert sich auch die pukeDespawnzeit in Abhängigkeit.
@@ -65,6 +68,9 @@ alwaysShowQuality: true
 # Ob in den Iteminformationen immer der Alkoholgehalt angezeigt weden soll, oder nur im Braustand [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # Ob das reifen in -Minecraft- Fässern aktiviert ist und wie viele Brewery Getränke in die diese getan werden können [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6
@@ -426,6 +432,7 @@ cauldron:
 #   Befehle nur für bestimmte Qualität möglich mit + Schlecht, ++ Mittel, +++ Gut, vorne anhängen.
 # drinkmessage: Nachricht im Chat beim trinken des Trankes
 # drinktitle: Nachricht als Titel auf dem Bildschirm an den Spieler beim trinken des Trankes
+# glint: Boolean if the item should have a glint (enchant glint)
 # customModelData: Custom Model Data Modelldaten. Mit dieser Zahl kann die Tranktextur mit einem Resourcepack geändert werden
 #   Es kann eine für alle, oder drei für die qualitäten schlecht/normal/gut agegeben werden, mit / getrennt
 # effects: Auflistung Effekt/Level/Dauer  Besonderere Trank-Effekte beim Trinken, Dauer in sek.

resources/config/v13/en/config.yml

@@ -7,6 +7,9 @@
 # Languagefile to be used (found in plugins/Brewery/languages)
 language: en
 
+# Prefix used on messages
+pluginPrefix: '&2[Brewery]&f '
+
 # If the player wakes up at /home when logging in after excessive drinking (/home plugin must be installed!) [true]
 enableHome: true
 
@@ -32,7 +35,7 @@ enableKickOnOverdrink: false
 enablePuke: true
 
 # Item that is dropped multiple times uncollectable when puking [Soul_Sand]
-pukeItem: Soul_Sand
+pukeItem: [Soul_Sand]
 
 # Time in seconds until the pukeitems despawn, (mc default is 300 = 5 min) [60]
 # If the item despawn time was changed in the spigot.yml, the pukeDespawntime changes as well.
@@ -65,6 +68,9 @@ alwaysShowQuality: true
 # Always show the alcohol content on the item. If false, it will only show in the brewing stand [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # If aging in -Minecraft- Barrels in enabled [true] and how many Brewery drinks can be put into them [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6
@@ -100,7 +106,7 @@ version: '3.1'
 #  material: Which type the item has to be
 #  name: Which name the item has to be (Formatting codes possible: such as &6)
 #  lore: What has to be in the lore of the item
-
+#  modeldata: Custom Model Data Int. Whatever Model data number the item has to have (NEEDS TO HAVE QUOTATIONS, SEE EXAMPLE)
 customItems:
   # Three Example Items
   ex-item:
@@ -126,6 +132,11 @@ customItems:
   rasp:
     name: '&cRaspberry'
 
+  modelitem:
+    material: paper
+    # modeldata must always be in quotations
+    modeldata: '12345'
+
   blue-flowers:
     matchAny: true
     material:
@@ -426,6 +437,7 @@ cauldron:
 #   Specific Commands for quality possible, using + bad, ++ normal, +++ good, added to the front of the line.
 # drinkmessage: Chat-message to the Player when drinking the Brew
 # drinktitle: Title on Screen to the Player when drinking the Brew
+# glint: Boolean if the item should have a glint (enchant glint)
 # customModelData: Custom Model Data Tag. This is a number that can be used to add custom textures to the item.
 #   Can specify one for all, or one for each quality, separated by /
 # effects: List of effect/level/duration  Special potion-effect when drinking, duration in sek.
@@ -467,6 +479,7 @@ recipes:
       - homes
     drinkmessage: Tastes good
     drinktitle: Warms you from inside
+    glint: true
     customModelData: 556/557/557
     effects:
       - FIRE_RESISTANCE/20

resources/config/v13/es/config.yml

@@ -7,6 +7,9 @@
 # Languagefile to be used (found in plugins/Brewery/languages)
 language: es
 
+# Prefix used on messages
+pluginPrefix: '&2[Brewery]&f '
+
 # If the player wakes up at /home when logging in after excessive drinking (/home plugin must be installed!) [true]
 enableHome: true
 
@@ -32,7 +35,7 @@ enableKickOnOverdrink: false
 enablePuke: true
 
 # Item that is dropped multiple times uncollectable when puking [Soul_Sand]
-pukeItem: Soul_Sand
+pukeItem: [Soul_Sand]
 
 # Time in seconds until the pukeitems despawn, (mc default is 300 = 5 min) [60]
 # If the item despawn time was changed in the spigot.yml, the pukeDespawntime changes as well.
@@ -65,6 +68,9 @@ alwaysShowQuality: true
 # Always show the alcohol content on the item. If false, it will only show in the brewing stand [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # If aging in -Minecraft- Barrels in enabled [true] and how many Brewery drinks can be put into them [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6
@@ -426,6 +432,7 @@ cauldron:
 #   Specific Commands for quality possible, using + bad, ++ normal, +++ good, added to the front of the line.
 # drinkmessage: Chat-message to the Player when drinking the Brew
 # drinktitle: Title on Screen to the Player when drinking the Brew
+# glint: Boolean if the item should have a glint (enchant glint)
 # customModelData: Custom Model Data Tag. This is a number that can be used to add custom textures to the item.
 #   Can specify one for all, or one for each quality, separated by /
 # effects: List of effect/level/duration  Special potion-effect when drinking, duration in sek.