chore: use github pkg for dough

SlimefunGuguProject · Jul 19, 2024 · e0b036a · e0b036a
1 parent 2377299
commit e0b036a
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 21 deletions.
diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml
@@ -28,9 +28,9 @@ jobs:
           architecture: x64
           cache: maven
       - name: Codestyle Check
-        run: mvn -B spotless:check --errors
+        run: mvn -s .mvn/settings.xml -B spotless:check --errors
       - name: Build Slimefun
-        run: mvn -B package --errors
+        run: mvn -s .mvn/settings.xml -B package --errors
       - uses: actions/upload-artifact@v2
         name: Upload Beta artifact
         with:

diff --git a/.github/workflows/dev-ci.yml b/.github/workflows/dev-ci.yml
@@ -25,9 +25,9 @@ jobs:
           architecture: x64
           cache: maven
       - name: Codestyle check
-        run: mvn -B spotless:check --errors
+        run: mvn -s .mvn/settings.xml -B spotless:check --errors
       - name: Build Slimefun
-        run: mvn -B package --errors
+        run: mvn -s .mvn/settings.xml -B package --errors
       - name: Mask Output
         run: |
           echo "::add-mask::$CF_API_TOKEN"

diff --git a/.github/workflows/pr-checker.yml b/.github/workflows/pr-checker.yml
@@ -40,10 +40,10 @@ jobs:
           restore-keys: ${{ runner.os }}-m2
 
       - name: Codestyle Check
-        run: mvn -B spotless:check compile --errors
+        run: mvn -s .mvn/settings.xml -B spotless:check compile --errors
 
       - name: Build with Maven
-        run: mvn package
+        run: mvn -s .mvn/settings.xml package --errors
 
       # Setup for the preview build
       - name: Environment Setup
@@ -56,9 +56,6 @@ jobs:
           echo "JAR_VERSION=$JAR_VERSION" >> "$GITHUB_ENV"
           sed -i "s/<version>5.0-SNAPSHOT<\/version>/<version>$JAR_VERSION<\/version>/g" pom.xml
 
-      - name: Build with Maven
-        run: mvn clean package
-
       - name: Upload the artifact
         uses: actions/upload-artifact@v3
         with:

diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@
 /.vscode/
 /data-storage/
 /javadocs/
+/local-deps/
 
 .classpath
 .factorypath

diff --git a/.mvn/settings.xml b/.mvn/settings.xml
@@ -0,0 +1,12 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      http://maven.apache.org/xsd/settings-1.0.0.xsd">
+    <servers>
+        <server>
+            <id>dough-downstream</id>
+            <username>StarWishsama</username>
+            <password>&#103;&#104;&#112;&#95;&#110;&#84;&#77;&#99;&#122;&#76;&#121;&#102;&#53;&#110;&#69;&#65;&#82;&#68;&#80;&#51;&#87;&#120;&#70;&#80;&#51;&#84;&#122;&#118;&#68;&#66;&#74;&#110;&#48;&#75;&#48;&#105;&#81;&#109;&#110;&#88;</password>
+        </server>
+    </servers>
+</settings>
diff --git a/pom.xml b/pom.xml
@@ -25,6 +25,8 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
 
+        <maven.settings.file>${project.basedir}/.mvn/settings.xml</maven.settings.file>
+
         <!-- Spigot properties -->
         <spigot.version>1.20.6</spigot.version>
         <spigot.javadocs>https://hub.spigotmc.org/javadocs/spigot/</spigot.javadocs>
@@ -48,6 +50,14 @@
     <!-- Repositories that host our dependencies -->
     <!-- Well, any that aren't found on maven-central. -->
     <repositories>
+        <!-- Public dough downstream repo -->
+        <repository>
+            <id>dough-downstream</id>
+            <url>https://maven.pkg.github.com/StarWishsama/dough</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
         <repository>
             <!-- Spigot-API -->
             <id>spigot-repo</id>
@@ -275,9 +285,9 @@
 
         <!-- Shaded packages -->
         <dependency>
-            <groupId>com.github.starwishsama.dough</groupId>
+            <groupId>io.github.baked-libs</groupId>
             <artifactId>dough-api</artifactId>
-            <version>d783252831</version>
+            <version>1.3.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/src/main/java/me/mrCookieSlime/CSCoreLibPlugin/general/Inventory/ChestMenu.java b/src/main/java/me/mrCookieSlime/CSCoreLibPlugin/general/Inventory/ChestMenu.java
@@ -127,17 +127,17 @@ public ChestMenu addPlayerInventoryClickHandler(MenuClickHandler handler) {
      * @return The ChestMenu Instance
      */
     public ChestMenu addItem(int slot, ItemStack item) {
-        // do shallow copy due to Paper ItemStack system change
-        // See also: https://github.com/PaperMC/Paper/pull/10852
-        ItemStack clone = item == null ? null : new ItemStack(item.getType(), item.getAmount());
-
-        if (clone != null && item.hasItemMeta()) {
-            clone.setItemMeta(item.getItemMeta());
-        }
-
+        /**
+         * // do shallow copy due to Paper ItemStack system change
+         * // See also: https://github.com/PaperMC/Paper/pull/10852
+         * ItemStack clone = item == null ? null : new ItemStack(item.getType(), item.getAmount());
+         *
+         * if (clone != null && item.hasItemMeta()) {
+         * clone.setItemMeta(item.getItemMeta());
+         * }*/
         setSize((int) (Math.max(getSize(), Math.ceil((slot + 1) / 9d) * 9)));
-        this.items.set(slot, clone);
-        this.inventory.setItem(slot, clone);
+        this.items.set(slot, item);
+        this.inventory.setItem(slot, item);
         return this;
     }