Skip to content

Commit

Permalink
Update 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Sn0wStorm committed Jun 15, 2021
1 parent f66d8f9 commit 3a44141
Show file tree
Hide file tree
Showing 16 changed files with 66 additions and 47 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>com.github.DieReicheErethons</groupId>
<artifactId>Brewery</artifactId>
<version>3.0</version>
<version>3.1</version>
<scope>provided</scope>
</dependency>
```
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.dre</groupId>
<artifactId>Brewery</artifactId>
<version>3.0</version>
<version>3.1</version>
<name>Brewery</name>

<properties>
Expand Down
7 changes: 3 additions & 4 deletions resources/config/v12/de/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -86,7 +88,7 @@ autosave: 3
debug: false

# Config Version
version: '3.0'
version: '3.1'
oldMat: true


Expand Down Expand Up @@ -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

Expand Down
7 changes: 3 additions & 4 deletions resources/config/v12/en/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -87,7 +89,7 @@ autosave: 3
debug: false

# Config Version
version: '3.0'
version: '3.1'
oldMat: true


Expand Down Expand Up @@ -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

Expand Down
7 changes: 3 additions & 4 deletions resources/config/v12/fr/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -88,7 +90,7 @@ autosave: 3
debug: false

# Version de configuration
version: '3.0'
version: '3.1'
oldMat: true


Expand Down Expand Up @@ -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

Expand Down
7 changes: 3 additions & 4 deletions resources/config/v12/it/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -87,7 +89,7 @@ autosave: 3
debug: false

# Versione del config
version: '3.0'
version: '3.1'
oldMat: true


Expand Down Expand Up @@ -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

Expand Down
7 changes: 3 additions & 4 deletions resources/config/v13/de/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -86,7 +88,7 @@ autosave: 3
debug: false

# Config Version
version: '3.0'
version: '3.1'



Expand Down Expand Up @@ -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

Expand Down
7 changes: 3 additions & 4 deletions resources/config/v13/en/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -87,7 +89,7 @@ autosave: 3
debug: false

# Config Version
version: '3.0'
version: '3.1'



Expand Down Expand Up @@ -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

Expand Down
7 changes: 3 additions & 4 deletions resources/config/v13/es/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -87,7 +89,7 @@ autosave: 3
debug: false

# Config Version
version: '3.0'
version: '3.1'



Expand Down Expand Up @@ -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

Expand Down
7 changes: 3 additions & 4 deletions resources/config/v13/fr/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -88,7 +90,7 @@ autosave: 3
debug: false

# Version de configuration
version: '3.0'
version: '3.1'



Expand Down Expand Up @@ -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

Expand Down
7 changes: 3 additions & 4 deletions resources/config/v13/it/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -87,7 +89,7 @@ autosave: 3
debug: false

# Versione del config
version: '3.0'
version: '3.1'



Expand Down Expand Up @@ -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

Expand Down
7 changes: 3 additions & 4 deletions resources/config/v13/zh/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -89,7 +91,7 @@ autosave: 3
debug: false

# 配置文件版本
version: '3.0'
version: '3.1'



Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion resources/plugin.yml
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
10 changes: 9 additions & 1 deletion src/com/dre/brewery/P.java
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/com/dre/brewery/filedata/BConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
25 changes: 23 additions & 2 deletions src/com/dre/brewery/filedata/ConfigUpdater.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 3a44141

Please sign in to comment.