fix(integrations): repair Lands hook and add flag title & descriptions to the translation files

Author: Mitality

src/main/java/com/dre/brewery/BreweryPlugin.java

@@ -28,6 +28,7 @@
 import com.dre.brewery.configuration.files.Lang;
 import com.dre.brewery.integration.BlockLockerHook;
 import com.dre.brewery.integration.Hook;
+import com.dre.brewery.integration.LandsHook;
 import com.dre.brewery.integration.PlaceholderAPIHook;
 import com.dre.brewery.integration.barrel.BlockLockerBarrel;
 import com.dre.brewery.integration.bstats.BreweryStats;
@@ -105,13 +106,17 @@ public final class BreweryPlugin extends JavaPlugin {
 
     @Override
     public void onLoad() {
+
         // movecraft properties must be registered in the onLoad
         try {
             Class.forName("net.countercraft.movecraft.craft.type.property.Property");
             BreweryProperties.register();
         } catch (Exception ignored) {
         }
 
+        // Lands flags must be registered onLoad
+        if (getServer().getPluginManager().getPlugin("Lands") != null) LandsHook.load();
+
         if (getMCVersion().isOrLater(MinecraftVersion.V1_14)) {
             // Campfires are weird. Initialize once now, so it doesn't lag later when we check for campfires under Cauldrons
             getServer().createBlockData(Material.CAMPFIRE);
@@ -120,6 +125,7 @@ public void onLoad() {
 
     @Override
     public void onEnable() {
+
         // Register Item Loaders
         CustomItem.registerItemLoader(this);
         SimpleItem.registerItemLoader(this);

src/main/java/com/dre/brewery/configuration/files/Lang.java

@@ -372,6 +372,10 @@ private static String format(String entry, Object... args) {
     private String etcSealingTable;
     @CustomKey("Etc_NewRelease")
     private String etcNewRelease;
+    @CustomKey("Etc_LandsFlag_Title")
+    private String etcLandsFlagTitle;
+    @CustomKey("Etc_LandsFlag_Description")
+    private String etcLandsFlagDescription;
 
 
     @Comment("Help")

src/main/java/com/dre/brewery/integration/LandsHook.java

@@ -21,7 +21,10 @@
 package com.dre.brewery.integration;
 
 import com.dre.brewery.BreweryPlugin;
+import com.dre.brewery.configuration.ConfigManager;
+import com.dre.brewery.configuration.files.Lang;
 import com.dre.brewery.utility.BUtil;
+import com.dre.brewery.utility.Logging;
 import me.angeschossen.lands.api.LandsIntegration;
 import me.angeschossen.lands.api.flags.enums.FlagTarget;
 import me.angeschossen.lands.api.flags.enums.RoleFlagCategory;
@@ -34,19 +37,29 @@
 
 public class LandsHook extends Hook {
 
-    public static LandsHook LANDS = new LandsHook("Lands", config.isUseLands());
+    public static LandsHook LANDS;
+    public static void load() {
+        LANDS = new LandsHook("Lands", config.isUseLands());
+    }
 
     private LandsIntegration landsApi;
     private RoleFlag barrelAccessFlag;
 
     public LandsHook(String name, boolean enabled) {
         super(name, enabled);
 
-        if (!this.isEnabled()) return;
+        // J, if you're reading this, please note that Lands isn't enabled
+        // at this point, so we can't use your Hook#isEnabled method here
+        if (!enabled) return;
+
+        Lang lang = ConfigManager.getConfig(Lang.class);
+        String flag_title = lang.getEntry("Etc_LandsFlag_Title");
+        String[] flag_description = lang.getEntry("Etc_LandsFlag_Description").split("\\\\n");
+
         this.landsApi = LandsIntegration.of(BreweryPlugin.getInstance());
         this.barrelAccessFlag = RoleFlag.of(landsApi, FlagTarget.PLAYER, RoleFlagCategory.ACTION, "barrel_access")
-            .setDisplayName("Barrel Access")
-            .setDescription(BUtil.colorArray("&r&7Allows opening", "&r&7BreweryX barrels."))
+            .setDisplayName(BUtil.color(flag_title))
+            .setDescription(BUtil.colorArray(flag_description))
             .setIcon(new ItemStack(Material.BARREL))
             .setDisplay(true);
     }

src/main/java/com/dre/brewery/integration/listeners/IntegrationListener.java

@@ -31,7 +31,6 @@
 import com.dre.brewery.configuration.files.Lang;
 import com.dre.brewery.integration.BlockLockerHook;
 import com.dre.brewery.integration.Hook;
-import com.dre.brewery.integration.LandsHook;
 import com.dre.brewery.integration.WorldGuarkHook;
 import com.dre.brewery.integration.barrel.BlockLockerBarrel;
 import com.dre.brewery.integration.barrel.GriefPreventionBarrel;

src/main/resources/languages/de.yml

@@ -59,6 +59,8 @@ Etc_Usage: 'Benutzung:'
 Etc_Barrel: Fass
 Etc_SealingTable: Trankversiegler
 Etc_NewRelease: '&rA new release of BreweryX is available! &2&v1 &r-> &2&v2&r Download&7: &2&v3'
+Etc_LandsFlag_Title: 'Fasszugriff'
+Etc_LandsFlag_Description: '&r&7Erlaubt das Öffnen\n&r&7von BreweryX-Fässern.'
 
 # Help
 Help_Copy: '&6/brew Copy [Anzahl]&9 Kopiert den Trank in deiner Hand'

src/main/resources/languages/en.yml

@@ -122,6 +122,8 @@ Etc_Page: Page
 Etc_Usage: 'Usage:'
 Etc_SealingTable: Brew Sealing Table
 Etc_NewRelease: '&rA new release of BreweryX is available! &2&v1 &r-> &2&v2&r Download&7: &2&v3'
+Etc_LandsFlag_Title: 'Barrel Access'
+Etc_LandsFlag_Description: '&r&7Allows opening\n&r&7BreweryX barrels.'
 
 # Help
 Help_Copy: '&6/brew copy [Quantity]&9 Copies the potion in your hand'

src/main/resources/languages/es.yml

@@ -59,6 +59,8 @@ Etc_Page: Página
 Etc_Usage: 'Uso:'
 Etc_SealingTable: Mesa de sellado de bebidas
 Etc_NewRelease: '&rA new release of BreweryX is available! &2&v1 &r-> &2&v2&r Download&7: &2&v3'
+Etc_LandsFlag_Title: 'Acceso a barriles'
+Etc_LandsFlag_Description: '&r&7Permite abrir\n&r&7barriles de BreweryX.'
 
 # Ayuda
 Help_Copy: '&6/brew copy [Cantidad]&9 Copia la bebida en tu mano'

src/main/resources/languages/fr.yml

@@ -64,6 +64,8 @@ Etc_Page: 'Page'
 Etc_Usage: 'Utilise :'
 Etc_SealingTable: 'Table de scellage des boissons'
 Etc_NewRelease: '&rMise à jour disponible ! &2&v1 &r-> &2&v2&r Téléchargez&7 : &2&v3'
+Etc_LandsFlag_Title: 'Accès aux tonneaux'
+Etc_LandsFlag_Description: '&r&7Permet d’ouvrir\n&r&7les tonneaux de BreweryX.'
 
 # Aide
 Help_Copy: '&6/brew copy [Quantity]&9 Copie la potion qui est dans votre main'

src/main/resources/languages/it.yml

@@ -59,6 +59,8 @@ Etc_Page: Pagina
 Etc_Usage: 'Utilizzo:'
 Etc_SealingTable: Brew Sealing Table
 Etc_NewRelease: '&rA new release of BreweryX is available! &2&v1 &r-> &2&v2&r Download&7: &2&v3'
+Etc_LandsFlag_Title: 'Accesso alle botti'
+Etc_LandsFlag_Description: '&r&7Consente di aprire\n&r&7le botti di BreweryX.'
 
 # Aiuto
 Help_Copy: '&6/brew copy [Quantità]&9 Copia la pozione che tieni in mano'

src/main/resources/languages/ru.yml

@@ -60,6 +60,8 @@ Etc_Page: 'Страница'
 Etc_Usage: 'Использование:'
 Etc_SealingTable: 'Стол закупорки напитков.'
 Etc_NewRelease: '&rДоступно новое обновление BreweryX! &2&v1 &r-> &2&v2&r Ссылка&7: &2&v3'
+Etc_LandsFlag_Title: 'Доступ к бочкам'
+Etc_LandsFlag_Description: '&r&7Позволяет открывать\n&r&7бочки BreweryX.'
 
 # Help
 Help_Copy: '&6/brew copy [Quantity]&9 Копирует зелье в твоей руке'