diff --git a/README.md b/README.md
index 9d4a5e38..5310ee14 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@
com.github.DieReicheErethons
Brewery
- 3.0
+ 3.1
provided
```
diff --git a/pom.xml b/pom.xml
index 50b77de0..b40e8d4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.dre
Brewery
- 3.0
+ 3.1
Brewery
diff --git a/resources/config/v12/de/config.yml b/resources/config/v12/de/config.yml
index 6988a3b9..427ffe5a 100644
--- a/resources/config/v12/de/config.yml
+++ b/resources/config/v12/de/config.yml
@@ -52,6 +52,8 @@ drainItems:
# Partikel steigen von Kesseln auf wenn sie Zutaten und eine Feuerquelle haben [true]
# Die sich ändernde Farbe der Partikel kann beim Fermentieren mancher Rezepte helfen
enableCauldronParticles: true
+# Ob nur ein Minimum an Kessel-Partikeln dargestellt werden sollen [false]
+minimalParticles: false
# Ob das craften und das benutzen des Trank-Versiegelungs-Tisches aktiviert ist (2 Flaschen über 4 Holz) [true, true]
craftSealingTable: true
@@ -86,7 +88,7 @@ autosave: 3
debug: false
# Config Version
-version: '3.0'
+version: '3.1'
oldMat: true
@@ -507,9 +509,6 @@ colorInBrewer: true
# Ob große Fässer an jedem Block geöffnet werden können, nicht nur an Zapfhahn und Schild. Bei kleinen Fässern geht dies immer. [true]
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
diff --git a/resources/config/v12/en/config.yml b/resources/config/v12/en/config.yml
index 8457b778..c1cfe3c4 100644
--- a/resources/config/v12/en/config.yml
+++ b/resources/config/v12/en/config.yml
@@ -52,6 +52,8 @@ drainItems:
# Show Particles over Cauldrons when they have ingredients and a heat source. [true]
# The changing color of the particles can help with timing some recipes
enableCauldronParticles: true
+# If Cauldron Particles should be reduced to the bare minimum [false]
+minimalParticles: false
# If crafting and using of the Brew Sealing Table is enabled (2 Bottles over 4 Planks) [true, true]
craftSealingTable: true
@@ -87,7 +89,7 @@ autosave: 3
debug: false
# Config Version
-version: '3.0'
+version: '3.1'
oldMat: true
@@ -508,9 +510,6 @@ colorInBrewer: true
# If a Large Barrel can be opened by clicking on any of its blocks, not just Spigot or Sign. This is always true for Small Barrels. [true]
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
diff --git a/resources/config/v12/fr/config.yml b/resources/config/v12/fr/config.yml
index 8624d5b5..991e8698 100644
--- a/resources/config/v12/fr/config.yml
+++ b/resources/config/v12/fr/config.yml
@@ -53,6 +53,8 @@ drainItems:
# Show Particles over Cauldrons when they have ingredients and a heat source. [true]
# The changing color of the particles can help with timing some recipes
enableCauldronParticles: true
+# If Cauldron Particles should be reduced to the bare minimum [false]
+minimalParticles: false
# If crafting and using of the Brew Sealing Table is enabled (2 Bottles over 4 Planks) [true, true]
craftSealingTable: true
@@ -88,7 +90,7 @@ autosave: 3
debug: false
# Version de configuration
-version: '3.0'
+version: '3.1'
oldMat: true
@@ -503,9 +505,6 @@ colorInBrewer: true
# Si le grand tonneau peut être ouvert en cliquant sur n'importe quel bloc, non seulement le robinet ou le panneau. Toujours "true" pour les petits tonneaux. [true]
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
diff --git a/resources/config/v12/it/config.yml b/resources/config/v12/it/config.yml
index 1025bbae..33a68c6b 100644
--- a/resources/config/v12/it/config.yml
+++ b/resources/config/v12/it/config.yml
@@ -52,6 +52,8 @@ drainItems:
# Show particles over cauldrons when they have ingredients and a heat source. [true]
# The changing color of the particles can help with timing some recipes
enableCauldronParticles: true
+# If Cauldron Particles should be reduced to the bare minimum [false]
+minimalParticles: false
# If crafting and using of the Brew Sealing Table is enabled (2 Bottles over 4 Planks) [true, true]
craftSealingTable: true
@@ -87,7 +89,7 @@ autosave: 3
debug: false
# Versione del config
-version: '3.0'
+version: '3.1'
oldMat: true
@@ -495,9 +497,6 @@ colorInBrewer: true
# Se un barile grande può essere aperto cliccandoci sopra, non solo sul cartello e sulla staccionata. Questo è sempre true per i barili piccoli. [true]
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
diff --git a/resources/config/v13/de/config.yml b/resources/config/v13/de/config.yml
index ad47398b..2e8cb597 100644
--- a/resources/config/v13/de/config.yml
+++ b/resources/config/v13/de/config.yml
@@ -52,6 +52,8 @@ drainItems:
# Partikel steigen von Kesseln auf wenn sie Zutaten und eine Feuerquelle haben [true]
# Die sich ändernde Farbe der Partikel kann beim Fermentieren mancher Rezepte helfen
enableCauldronParticles: true
+# Ob nur ein Minimum an Kessel-Partikeln dargestellt werden sollen [false]
+minimalParticles: false
# Ob das craften und das benutzen des Trank-Versiegelungs-Tisches aktiviert ist (2 Flaschen über 4 Holz) [true, true]
craftSealingTable: true
@@ -86,7 +88,7 @@ autosave: 3
debug: false
# Config Version
-version: '3.0'
+version: '3.1'
@@ -905,9 +907,6 @@ colorInBrewer: true
# Ob große Fässer an jedem Block geöffnet werden können, nicht nur an Zapfhahn und Schild. Bei kleinen Fässern geht dies immer. [true]
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
diff --git a/resources/config/v13/en/config.yml b/resources/config/v13/en/config.yml
index 219297a3..e428593d 100644
--- a/resources/config/v13/en/config.yml
+++ b/resources/config/v13/en/config.yml
@@ -52,6 +52,8 @@ drainItems:
# Show Particles over Cauldrons when they have ingredients and a heat source. [true]
# The changing color of the particles can help with timing some recipes
enableCauldronParticles: true
+# If Cauldron Particles should be reduced to the bare minimum [false]
+minimalParticles: false
# If crafting and using of the Brew Sealing Table is enabled (2 Bottles over 4 Planks) [true, true]
craftSealingTable: true
@@ -87,7 +89,7 @@ autosave: 3
debug: false
# Config Version
-version: '3.0'
+version: '3.1'
@@ -898,9 +900,6 @@ colorInBrewer: true
# If a Large Barrel can be opened by clicking on any of its blocks, not just Spigot or Sign. This is always true for Small Barrels. [true]
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
diff --git a/resources/config/v13/es/config.yml b/resources/config/v13/es/config.yml
index 4732918f..a907670d 100644
--- a/resources/config/v13/es/config.yml
+++ b/resources/config/v13/es/config.yml
@@ -52,6 +52,8 @@ drainItems:
# Show Particles over Cauldrons when they have ingredients and a heat source. [true]
# The changing color of the particles can help with timing some recipes
enableCauldronParticles: true
+# If Cauldron Particles should be reduced to the bare minimum [false]
+minimalParticles: false
# If crafting and using of the Brew Sealing Table is enabled (2 Bottles over 4 Planks) [true, true]
craftSealingTable: true
@@ -87,7 +89,7 @@ autosave: 3
debug: false
# Config Version
-version: '3.0'
+version: '3.1'
@@ -897,9 +899,6 @@ colorInBrewer: true
# If a Large Barrel can be opened by clicking on any of its blocks, not just Spigot or Sign. This is always true for Small Barrels. [true]
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
diff --git a/resources/config/v13/fr/config.yml b/resources/config/v13/fr/config.yml
index 6e22d9cf..cd1e8ed4 100644
--- a/resources/config/v13/fr/config.yml
+++ b/resources/config/v13/fr/config.yml
@@ -53,6 +53,8 @@ drainItems:
# Show Particles over Cauldrons when they have ingredients and a heat source. [true]
# The changing color of the particles can help with timing some recipes
enableCauldronParticles: true
+# If Cauldron Particles should be reduced to the bare minimum [false]
+minimalParticles: false
# If crafting and using of the Brew Sealing Table is enabled (2 Bottles over 4 Planks) [true, true]
craftSealingTable: true
@@ -88,7 +90,7 @@ autosave: 3
debug: false
# Version de configuration
-version: '3.0'
+version: '3.1'
@@ -903,9 +905,6 @@ colorInBrewer: true
# Si le grand tonneau peut être ouvert en cliquant sur n'importe quel bloc, non seulement le robinet ou le panneau. Toujours "true" pour les petits tonneaux. [true]
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
diff --git a/resources/config/v13/it/config.yml b/resources/config/v13/it/config.yml
index 42257947..b1830287 100644
--- a/resources/config/v13/it/config.yml
+++ b/resources/config/v13/it/config.yml
@@ -52,6 +52,8 @@ drainItems:
# Show Particles over Cauldrons when they have ingredients and a heat source. [true]
# The changing color of the particles can help with timing some recipes
enableCauldronParticles: true
+# If Cauldron Particles should be reduced to the bare minimum [false]
+minimalParticles: false
# If crafting and using of the Brew Sealing Table is enabled (2 Bottles over 4 Planks) [true, true]
craftSealingTable: true
@@ -87,7 +89,7 @@ autosave: 3
debug: false
# Versione del config
-version: '3.0'
+version: '3.1'
@@ -897,9 +899,6 @@ colorInBrewer: true
# Se un barile grande può essere aperto cliccandoci sopra, non solo sul cartello e sulla staccionata. Questo è sempre true per i barili piccoli. [true]
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
diff --git a/resources/config/v13/zh/config.yml b/resources/config/v13/zh/config.yml
index 834937bd..bb04d925 100644
--- a/resources/config/v13/zh/config.yml
+++ b/resources/config/v13/zh/config.yml
@@ -54,6 +54,8 @@ drainItems:
# Show Particles over Cauldrons when they have ingredients and a heat source. [true]
# The changing color of the particles can help with timing some recipes
enableCauldronParticles: true
+# If Cauldron Particles should be reduced to the bare minimum [false]
+minimalParticles: false
# If crafting and using of the Brew Sealing Table is enabled (2 Bottles over 4 Planks) [true, true]
craftSealingTable: true
@@ -89,7 +91,7 @@ autosave: 3
debug: false
# 配置文件版本
-version: '3.0'
+version: '3.1'
@@ -901,9 +903,6 @@ colorInBrewer: true
# 大型熟成木桶可以通过右击桶身任意一个位置来打开, 而不需要专门右击其龙头. 这一操作对小型酒桶总为真.[true]
openLargeBarrelEverywhere: false
-# 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
diff --git a/resources/plugin.yml b/resources/plugin.yml
index 1057db91..d07c7a56 100644
--- a/resources/plugin.yml
+++ b/resources/plugin.yml
@@ -1,5 +1,5 @@
name: Brewery
-version: 3.0
+version: 3.1
main: com.dre.brewery.P
softdepend: [LWC, LogBlock, WorldGuard, GriefPrevention, Vault, ChestShop, Shopkeepers, Towny, BlockLocker]
authors: [Milan Albrecht, Frank Baumann, ProgrammerDan, Daniel Saukel]
diff --git a/src/com/dre/brewery/P.java b/src/com/dre/brewery/P.java
index 93b8fa32..5e53dc3e 100644
--- a/src/com/dre/brewery/P.java
+++ b/src/com/dre/brewery/P.java
@@ -364,7 +364,15 @@ private void setupMetrics() {
}
}));
-
+ metrics.addCustomChart(new SimplePie("cauldron_particles", () -> {
+ if (!BConfig.enableCauldronParticles) {
+ return "disabled";
+ }
+ if (BConfig.minimalParticles) {
+ return "minimal";
+ }
+ return "enabled";
+ }));
metrics.addCustomChart(new SimplePie("wakeups", () -> {
if (!BConfig.enableWake) {
return "disabled";
diff --git a/src/com/dre/brewery/filedata/BConfig.java b/src/com/dre/brewery/filedata/BConfig.java
index 44db1418..b6db9958 100644
--- a/src/com/dre/brewery/filedata/BConfig.java
+++ b/src/com/dre/brewery/filedata/BConfig.java
@@ -40,7 +40,7 @@
public class BConfig {
- public static final String configVersion = "3.0";
+ public static final String configVersion = "3.1";
public static boolean updateCheck;
public static CommandSender reloader;
diff --git a/src/com/dre/brewery/filedata/ConfigUpdater.java b/src/com/dre/brewery/filedata/ConfigUpdater.java
index 0bd10f91..11b18153 100644
--- a/src/com/dre/brewery/filedata/ConfigUpdater.java
+++ b/src/com/dre/brewery/filedata/ConfigUpdater.java
@@ -11,7 +11,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.Map;
import java.util.Objects;
public class ConfigUpdater {
@@ -250,9 +249,17 @@ public void update(String fromVersion, boolean oldMat, String lang, FileConfigur
} else {
update30en();
}
- updateVersion(BConfig.configVersion);
fromVersion = "3.0";
}
+ if (fromVersion.equals("3.0")) {
+ if (de) {
+ update31de();
+ } else {
+ update31en();
+ }
+ updateVersion(BConfig.configVersion);
+ fromVersion = "3.1";
+ }
if (P.use1_13 && oldMat) {
updateMaterials(true);
@@ -2004,6 +2011,20 @@ private void update30en() {
"minimalParticles: false");
}
+ private void update31en() {
+ addLinesAt(new String[]{"minimalParticles:", "loadDataAsync:", "openLargeBarrelEverywhere:", "colorInBrewer:"}, 1,
+ "",
+ "# Allow emptying brews into hoppers to discard brews while keeping the glass bottle [true]",
+ "brewHopperDump: true");
+ }
+
+ private void update31de() {
+ addLinesAt(new String[]{"minimalParticles:", "loadDataAsync:", "openLargeBarrelEverywhere:", "colorInBrewer:"}, 1,
+ "",
+ "# Ob das Entleeren von Brewery Tränken mit Hilfe von Trichtern möglich ist, um die Glasflasche zurück zu bekommen [true]",
+ "brewHopperDump: true");
+ }
+
private void convertCookedSection(FileConfiguration yml, int toLine) {