From b2a8f2bba37cabc7e9bc33cb6e0f321d391c2e75 Mon Sep 17 00:00:00 2001
From: James Peters <email@jamesdpeters.com>
Date: Fri, 9 Jun 2023 20:22:26 +0100
Subject: [PATCH] Fix repositories, no need to build NMS anymore

---
 .github/workflows/maven.yml                   | 52 -------------------
 ChestsPlusPlus_Main/pom.xml                   | 41 +++------------
 .../src/main/resources/lang/en_GB.properties  |  2 +-
 pom.xml                                       | 21 ++++++++
 4 files changed, 29 insertions(+), 87 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 42aba75..62c1119 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -20,66 +20,14 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     
-    - name: Cache BuildTools
-      id: cache-buildtools
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/.m2
-          ~/BuildTools
-        key: buildtools-cache-${{ hashFiles('**/spigot-*.jar') }}
-    
-    - name: Check BuildTools cached
-      run: |
-        mkdir -p ~/BuildTools
-        ls ~/BuildTools
-      shell: bash
-      
-    - name: Set up JDK 16
-      uses: actions/setup-java@v2
-      with:
-        java-version: '16'
-        distribution: 'adopt'
-
-    - name: Run BuildTools 1.17
-      working-directory: BuildTools
-      run: |
-        cd ~/BuildTools
-        # make file runnable, might not be necessary
-        chmod +x "${GITHUB_WORKSPACE}/BuildTools/build-1.17.sh"
-        # run script
-        bash ${GITHUB_WORKSPACE}/BuildTools/build-1.17.sh
-      shell: bash
-    
     - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
         java-version: '17'
         distribution: 'adopt'
-
-    - name: Run BuildTools 1.18+
-      working-directory: BuildTools
-      run: |
-        cd ~/BuildTools
-        # make file runnable, might not be necessary
-        chmod +x "${GITHUB_WORKSPACE}/BuildTools/build-1.18+.sh"
-        # run script
-        bash ${GITHUB_WORKSPACE}/BuildTools/build-1.18+.sh
-      shell: bash
-      
-    - name: Check BuildTools cached
-      run: |
-        mkdir -p ~/BuildTools
-        ls ~/BuildTools
-      shell: bash
       
     - name: Build with Maven
       run: mvn -B package --file pom.xml
-      
-#     - name: Check Folders
-#       run: |
-#         ls -R
-#       shell: bash
               
     - name: Upload Release Asset
       id: upload-release-asset 
diff --git a/ChestsPlusPlus_Main/pom.xml b/ChestsPlusPlus_Main/pom.xml
index 8c955bb..aaea41d 100644
--- a/ChestsPlusPlus_Main/pom.xml
+++ b/ChestsPlusPlus_Main/pom.xml
@@ -4,7 +4,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.jamesdpeters.minecraft.chests</groupId>
+    <parent>
+        <groupId>com.jamesdpeters.minecraft.chests</groupId>
+        <artifactId>ChestsPlusPlus-Parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
     <artifactId>ChestsPlusPlus-Master</artifactId>
     <version>2.9-Release</version>
 
@@ -20,38 +25,6 @@
         <tag>@{project.version}</tag>
     </scm>
 
-    <repositories>
-        <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-        </repository>
-
-        <repository>
-            <id>dmulloy2-repo</id>
-            <url>https://repo.dmulloy2.net/nexus/repository/public/</url>
-        </repository>
-
-        <repository>
-            <id>CodeMC</id>
-            <url>https://repo.codemc.org/repository/maven-public</url>
-        </repository>
-
-<!--        <repository>-->
-<!--            <id>sytm-nexus</id>-->
-<!--            <url>https://repo.sytm.de/repository/maven-hosted/</url>-->
-<!--        </repository>-->
-
-        <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
-        </repository>
-
-        <repository>
-            <id>codemc-snapshots</id>
-            <url>https://repo.codemc.io/repository/maven-snapshots/</url>
-        </repository>
-    </repositories>
-
     <pluginRepositories>
         <pluginRepository>
             <id>maven-snapshots</id>
@@ -89,7 +62,7 @@
 
         <dependency>
             <groupId>net.wesjd</groupId>
-            <artifactId>AnvilGUI</artifactId>
+            <artifactId>anvilgui</artifactId>
             <version>1.6.6-SNAPSHOT</version>
         </dependency>
 
diff --git a/ChestsPlusPlus_Main/src/main/resources/lang/en_GB.properties b/ChestsPlusPlus_Main/src/main/resources/lang/en_GB.properties
index 6308067..1548d03 100644
--- a/ChestsPlusPlus_Main/src/main/resources/lang/en_GB.properties
+++ b/ChestsPlusPlus_Main/src/main/resources/lang/en_GB.properties
@@ -1,4 +1,4 @@
-# Chests++ Language File (Version 2.8-Release)
+# Chests++ Language File (Version 2.9-Release)
 # NOTE: This file gets replaced when the plugin launches! If you want to make modifications create a copy first!
 # To create a new language file simply create a copy of this file and rename it to your desired choice for example 'en_US.properties'
 # It should be located in the 'lang' folder
diff --git a/pom.xml b/pom.xml
index 81c3a7b..86a7461 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,10 +27,31 @@
     </modules>
 
     <repositories>
+        <repository>
+            <id>codemc-snapshots</id>
+            <url>https://repo.codemc.io/repository/maven-snapshots/</url>
+            <snapshots/>
+        </repository>
+        <repository>
+            <id>codemc-repo</id>
+            <url>https://repo.codemc.io/repository/maven-public/</url>
+        </repository>
+        <repository>
+            <id>nms-repo</id>
+            <url>https://repo.codemc.io/repository/nms/</url>
+        </repository>
         <repository>
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
+        <repository>
+            <id>dmulloy2-repo</id>
+            <url>https://repo.dmulloy2.net/nexus/repository/public/</url>
+        </repository>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
     </repositories>
 
 </project>
\ No newline at end of file