From 2cd52955a0bd8acdaa7b4f18ffbdb95e0472035f Mon Sep 17 00:00:00 2001 From: Sn0wStorm Date: Mon, 13 Apr 2020 12:01:41 +0200 Subject: [PATCH] Added Config option to disable MC Barrel Aging issue #265 --- resources/config/v12/de/config.yml | 3 ++- resources/config/v12/en/config.yml | 3 ++- resources/config/v12/fr/config.yml | 3 ++- resources/config/v12/it/config.yml | 3 ++- resources/config/v13/de/config.yml | 3 ++- resources/config/v13/en/config.yml | 3 ++- resources/config/v13/fr/config.yml | 3 ++- resources/config/v13/it/config.yml | 3 ++- resources/config/v13/zh/config.yml | 1 + src/com/dre/brewery/MCBarrel.java | 5 ++++- src/com/dre/brewery/filedata/BConfig.java | 6 +++++- src/com/dre/brewery/listeners/InventoryListener.java | 4 +++- 12 files changed, 29 insertions(+), 11 deletions(-) diff --git a/resources/config/v12/de/config.yml b/resources/config/v12/de/config.yml index 5b9da71..d9204ff 100644 --- a/resources/config/v12/de/config.yml +++ b/resources/config/v12/de/config.yml @@ -63,7 +63,8 @@ alwaysShowAlc: false # 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 -# Wie viele Brewery Getränke in die Minecraft Fässer getan werden können [6] +# 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 # Benutzte Zutaten und andere Brau-Daten werden in allen Brewery Tränken gespeichert. Um zu verhindern, diff --git a/resources/config/v12/en/config.yml b/resources/config/v12/en/config.yml index e36af33..6275524 100644 --- a/resources/config/v12/en/config.yml +++ b/resources/config/v12/en/config.yml @@ -63,7 +63,8 @@ alwaysShowAlc: false # 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 -# How many Brewery drinks can be put into the Minecraft barrels [6] +# If aging in -Minecraft- Barrels in enabled [true] and how many Brewery drinks can be put into them [6] +ageInMCBarrels: true maxBrewsInMCBarrels: 6 # The used Ingredients and other brewing-data is saved to all Brewery Items. To prevent diff --git a/resources/config/v12/fr/config.yml b/resources/config/v12/fr/config.yml index fcc3f4f..be5209f 100644 --- a/resources/config/v12/fr/config.yml +++ b/resources/config/v12/fr/config.yml @@ -64,7 +64,8 @@ alwaysShowAlc: false # 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 -# Combien de boissons de brasserie peuvent être mises dans les barils Minecraft [6] +# Combien de boissons de brasserie peuvent être mises dans les barils -Minecraft- [6] +ageInMCBarrels: true maxBrewsInMCBarrels: 6 # Les ingrédients et autres données de brassage utilisés sont sauvegardés dans tous les articles de brasserie. [false] diff --git a/resources/config/v12/it/config.yml b/resources/config/v12/it/config.yml index c3675da..571f61f 100644 --- a/resources/config/v12/it/config.yml +++ b/resources/config/v12/it/config.yml @@ -63,7 +63,8 @@ alwaysShowAlc: false # 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 -# How many Brewery drinks can be put into the Minecraft barrels [6] +# If aging in -Minecraft- Barrels in enabled [true] and how many Brewery drinks can be put into them [6] +ageInMCBarrels: true maxBrewsInMCBarrels: 6 # The used Ingredients and other brewing-data is saved to all Brewery Items. To prevent diff --git a/resources/config/v13/de/config.yml b/resources/config/v13/de/config.yml index 95fe1c2..ae9a625 100644 --- a/resources/config/v13/de/config.yml +++ b/resources/config/v13/de/config.yml @@ -63,7 +63,8 @@ alwaysShowAlc: false # 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 -# Wie viele Brewery Getränke in die Minecraft Fässer getan werden können [6] +# 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 # Benutzte Zutaten und andere Brau-Daten werden in allen Brewery Tränken gespeichert. Um zu verhindern, diff --git a/resources/config/v13/en/config.yml b/resources/config/v13/en/config.yml index 63ea861..dae6317 100644 --- a/resources/config/v13/en/config.yml +++ b/resources/config/v13/en/config.yml @@ -63,7 +63,8 @@ alwaysShowAlc: false # 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 -# How many Brewery drinks can be put into the Minecraft barrels [6] +# If aging in -Minecraft- Barrels in enabled [true] and how many Brewery drinks can be put into them [6] +ageInMCBarrels: true maxBrewsInMCBarrels: 6 # The used Ingredients and other brewing-data is saved to all Brewery Items. To prevent diff --git a/resources/config/v13/fr/config.yml b/resources/config/v13/fr/config.yml index 7a05dff..67a84e2 100644 --- a/resources/config/v13/fr/config.yml +++ b/resources/config/v13/fr/config.yml @@ -64,7 +64,8 @@ alwaysShowAlc: false # 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 -# Combien de boissons de brasserie peuvent être mises dans les barils Minecraft [6] +# Combien de boissons de brasserie peuvent être mises dans les barils -Minecraft- [6] +ageInMCBarrels: true maxBrewsInMCBarrels: 6 # Les ingrédients et autres données de brassage utilisés sont sauvegardés dans tous les articles de brasserie. [false] diff --git a/resources/config/v13/it/config.yml b/resources/config/v13/it/config.yml index 3bc44b8..ff837c4 100644 --- a/resources/config/v13/it/config.yml +++ b/resources/config/v13/it/config.yml @@ -63,7 +63,8 @@ alwaysShowAlc: false # 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 -# How many Brewery drinks can be put into the Minecraft barrels [6] +# If aging in -Minecraft- Barrels in enabled [true] and how many Brewery drinks can be put into them [6] +ageInMCBarrels: true maxBrewsInMCBarrels: 6 # The used Ingredients and other brewing-data is saved to all Brewery Items. To prevent diff --git a/resources/config/v13/zh/config.yml b/resources/config/v13/zh/config.yml index b42a5d6..d996015 100644 --- a/resources/config/v13/zh/config.yml +++ b/resources/config/v13/zh/config.yml @@ -66,6 +66,7 @@ alwaysShowAlc: false openLargeBarrelEverywhere: false # MC自带的桶内可以存放多少饮品 [6] +ageInMCBarrels: true maxBrewsInMCBarrels: 6 # The used Ingredients and other brewing-data is saved to all Brewery Items. To prevent diff --git a/src/com/dre/brewery/MCBarrel.java b/src/com/dre/brewery/MCBarrel.java index 2c0308b..910e405 100644 --- a/src/com/dre/brewery/MCBarrel.java +++ b/src/com/dre/brewery/MCBarrel.java @@ -19,6 +19,7 @@ public class MCBarrel { public static final byte OAK = 2; public static final String TAG = "Btime"; public static int maxBrews = 6; + public static boolean enableAging = true; public static long mcBarrelTime; // Globally stored Barrel time. Difference between this and the time stored on each mc-barrel will give the barrel age time public static List openBarrels = new ArrayList<>(); @@ -115,7 +116,9 @@ public class MCBarrel { public static void onUpdate() { - mcBarrelTime++; + if (enableAging) { + mcBarrelTime++; + } } // Used to visually stop Players from placing more than 6 (configurable) brews in the MC Barrels. diff --git a/src/com/dre/brewery/filedata/BConfig.java b/src/com/dre/brewery/filedata/BConfig.java index abf52a6..85bf163 100644 --- a/src/com/dre/brewery/filedata/BConfig.java +++ b/src/com/dre/brewery/filedata/BConfig.java @@ -240,10 +240,14 @@ public class BConfig { alwaysShowAlc = config.getBoolean("alwaysShowAlc", false); enableEncode = config.getBoolean("enableEncode", false); openEverywhere = config.getBoolean("openLargeBarrelEverywhere", false); - MCBarrel.maxBrews = config.getInt("maxBrewsInMCBarrels", 6); useOffhandForCauldron = config.getBoolean("useOffhandForCauldron", false); loadDataAsync = config.getBoolean("loadDataAsync", true); + if (P.use1_14) { + MCBarrel.maxBrews = config.getInt("maxBrewsInMCBarrels", 6); + MCBarrel.enableAging = config.getBoolean("ageInMCBarrels", true); + } + Brew.loadSeed(config, new File(P.p.getDataFolder(), "config.yml")); if (!P.use1_13) { diff --git a/src/com/dre/brewery/listeners/InventoryListener.java b/src/com/dre/brewery/listeners/InventoryListener.java index be3ad66..676ff19 100644 --- a/src/com/dre/brewery/listeners/InventoryListener.java +++ b/src/com/dre/brewery/listeners/InventoryListener.java @@ -177,6 +177,7 @@ public class InventoryListener implements Listener { public void onInventoryClickMCBarrel(InventoryClickEvent event) { if (!P.use1_14) return; if (event.getInventory().getType() != InventoryType.BARREL) return; + if (!MCBarrel.enableAging) return; Inventory inv = event.getInventory(); for (MCBarrel barrel : MCBarrel.openBarrels) { @@ -227,6 +228,7 @@ public class InventoryListener implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onInventoryOpen(InventoryOpenEvent event) { if (!P.use1_14) return; + if (!MCBarrel.enableAging) return; /*Barrel x = null; if (event.getInventory().getHolder() instanceof Barrel) { @@ -311,7 +313,7 @@ public class InventoryListener implements Listener { } // Check for MC Barrel - if (event.getInventory().getType() == InventoryType.BARREL) { + if (MCBarrel.enableAging && event.getInventory().getType() == InventoryType.BARREL) { Inventory inv = event.getInventory(); for (Iterator iter = MCBarrel.openBarrels.iterator(); iter.hasNext(); ) { MCBarrel barrel = iter.next();