Update dependencies.

Replace GuiUtils with PanelUtils.
BentoBoxWorld · Feb 1, 2022 · c2c9b9a · c2c9b9a
1 parent cb9091f
commit c2c9b9a
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 126 deletions.
diff --git a/pom.xml b/pom.xml
@@ -51,8 +51,10 @@
         <!-- More visible way how to change dependency versions -->
         <spigot.version>1.17-R0.1-SNAPSHOT</spigot.version>
         <!-- BentoBox API version -->
-        <bentobox.version>1.17.0</bentobox.version>
+        <bentobox.version>1.19.0</bentobox.version>
         <vault.version>1.7</vault.version>
+        <!-- Panel Utils version -->
+        <panelutils.version>1.0.0</panelutils.version>
         <!-- Revision variable removes warning about dynamic version -->
         <revision>${build.version}-SNAPSHOT</revision>
         <!-- This allows to change between versions and snapshots. -->
@@ -166,7 +168,12 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>18.0.0</version>
+            <version>22.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>lv.id.bonne</groupId>
+            <artifactId>panelutils</artifactId>
+            <version>${panelutils.version}</version>
         </dependency>
     </dependencies>
 
@@ -260,6 +267,38 @@
                 <artifactId>maven-install-plugin</artifactId>
                 <version>2.5.2</version>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.3.1-SNAPSHOT</version>
+                <configuration>
+                    <minimizeJar>true</minimizeJar>
+                    <artifactSet>
+                        <includes>
+                            <include>lv.id.bonne:panelutils:*</include>
+                        </includes>
+                    </artifactSet>
+                    <transformers>
+                        <!-- Add a transformer to exclude any other manifest files (possibly from dependencies). -->
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
+                            <resource>MANIFEST.MF</resource>
+                        </transformer>
+                        <!-- Add a transformer to include your custom manifest file. -->
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+                            <resource>META-INF/MANIFEST.MF</resource>
+                            <file>src/main/resources/META-INF/MANIFEST.MF</file>
+                        </transformer>
+                    </transformers>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>

diff --git a/src/main/java/world/bentobox/visit/panels/GuiUtils.java b/src/main/java/world/bentobox/visit/panels/GuiUtils.java
diff --git a/src/main/java/world/bentobox/visit/panels/admin/AdminPanel.java b/src/main/java/world/bentobox/visit/panels/admin/AdminPanel.java
@@ -14,6 +14,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+import lv.id.bonne.panelutils.PanelUtils;
 import world.bentobox.bentobox.api.panels.PanelItem;
 import world.bentobox.bentobox.api.panels.builders.PanelBuilder;
 import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
@@ -22,7 +23,6 @@
 import world.bentobox.visit.VisitAddon;
 import world.bentobox.visit.configs.Settings;
 import world.bentobox.visit.panels.ConversationUtils;
-import world.bentobox.visit.panels.GuiUtils;
 import world.bentobox.visit.panels.player.ConfigurePanel;
 import world.bentobox.visit.utils.Constants;
 import world.bentobox.visit.utils.Utils;
@@ -60,7 +60,7 @@ private void build()
             name(this.user.getTranslation(Constants.TITLES + "main"));
 
         // Fill border
-        GuiUtils.fillBorder(panelBuilder, 5, Material.MAGENTA_STAINED_GLASS_PANE);
+        PanelUtils.fillBorder(panelBuilder, 5, Material.MAGENTA_STAINED_GLASS_PANE);
 
         panelBuilder.item(10, this.createButton(Button.MANAGE));
         panelBuilder.item(28, this.createButton(Button.RESET));