From 5f5bc7ebe068703514d40e13b831e8fd1c4a7826 Mon Sep 17 00:00:00 2001
From: Ashijin <xikage@gmail.com>
Date: Sat, 12 Mar 2022 03:01:22 -0700
Subject: [PATCH] fix
---
dist/.flattened-pom.xml | 50 --------
dist/.gitignore | 1 +
dist/pom.xml | 22 ++--
plugin/.flattened-pom.xml | 115 ++++++++++++++++++
plugin/pom.xml | 12 +-
.../cosmetics/commands/CommandHelper.java | 2 +-
6 files changed, 131 insertions(+), 71 deletions(-)
delete mode 100644 dist/.flattened-pom.xml
create mode 100644 dist/.gitignore
create mode 100644 plugin/.flattened-pom.xml
diff --git a/dist/.flattened-pom.xml b/dist/.flattened-pom.xml
deleted file mode 100644
index 77c7ca0..0000000
--- a/dist/.flattened-pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>io.lumine</groupId>
- <artifactId>MCCosmetics-Dist</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <repositories>
- <repository>
- <id>spigot-repo</id>
- <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
- </repository>
- <repository>
- <id>lumine</id>
- <url>https://mvn.lumine.io/repository/maven/</url>
- </repository>
- <repository>
- <id>nexus</id>
- <url>https://mvn.lumine.io/repository/maven-private/</url>
- </repository>
- <repository>
- <id>sk89q-repo</id>
- <url>https://maven.sk89q.com/repo/</url>
- </repository>
- <repository>
- <id>md_5-snapshots</id>
- <url>https://repo.md-5.net/content/repositories/snapshots/</url>
- </repository>
- <repository>
- <id>placeholderapi</id>
- <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
- </repository>
- <repository>
- <id>filoghost-repo</id>
- <url>https://ci.filoghost.me/plugin/repository/everything/</url>
- </repository>
- <repository>
- <id>papermc</id>
- <url>https://papermc.io/repo/repository/maven-public/</url>
- </repository>
- <repository>
- <id>CodeMC</id>
- <url>https://repo.codemc.org/repository/maven-public</url>
- </repository>
- <repository>
- <id>jitpack.io</id>
- <url>https://jitpack.io</url>
- </repository>
- </repositories>
-</project>
diff --git a/dist/.gitignore b/dist/.gitignore
new file mode 100644
index 0000000..e3425b9
--- /dev/null
+++ b/dist/.gitignore
@@ -0,0 +1 @@
+/.flattened-pom.xml
diff --git a/dist/pom.xml b/dist/pom.xml
index 7470e11..61a68bb 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -8,6 +8,12 @@
<version>${mccosmetics.version}</version>
</parent>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>maven-snapshots</id>
+ <url>https://repository.apache.org/content/repositories/snapshots/</url>
+ </pluginRepository>
+ </pluginRepositories>
<dependencies>
<dependency>
<groupId>io.lumine</groupId>
@@ -49,7 +55,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
+ <version>3.3.0-SNAPSHOT</version>
<executions>
<execution>
<phase>package</phase>
@@ -60,15 +66,11 @@
<relocations>
<relocation>
<pattern>org.bstats</pattern>
- <shadedPattern>io.lumine.xikage.mythicmobs.metrics</shadedPattern>
- </relocation>
- <relocation>
- <pattern>org.reflections</pattern>
- <shadedPattern>io.lumine.xikage.mythicmobs.util.reflections</shadedPattern>
+ <shadedPattern>io.lumine.cosmetics.metrics</shadedPattern>
</relocation>
<relocation>
<pattern>io.lumine.utils</pattern>
- <shadedPattern>io.lumine.xikage.mythicmobs.utils</shadedPattern>
+ <shadedPattern>io.lumine.cosmetics.utils</shadedPattern>
</relocation>
</relocations>
<minimizeJar>false</minimizeJar>
@@ -82,7 +84,7 @@
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version>
<configuration>
- <finalName>MythicMobs-${project.parent.version}</finalName>
+ <finalName>MCCosmetics-${project.parent.version}</finalName>
<outputDirectory>../target</outputDirectory>
</configuration>
</plugin>
@@ -92,8 +94,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>16</source>
+ <target>16</target>
</configuration>
</plugin>
diff --git a/plugin/.flattened-pom.xml b/plugin/.flattened-pom.xml
new file mode 100644
index 0000000..de656c5
--- /dev/null
+++ b/plugin/.flattened-pom.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>io.lumine</groupId>
+ <artifactId>MCCosmetics</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>io.lumine</groupId>
+ <artifactId>LumineUtils</artifactId>
+ <version>1.18-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.18.22</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.ticxo.modelengine</groupId>
+ <artifactId>api</artifactId>
+ <version>R2.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.papermc.paper</groupId>
+ <artifactId>paper-api</artifactId>
+ <version>1.17-R0.1-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.comphenix.protocol</groupId>
+ <artifactId>ProtocolLib-API</artifactId>
+ <version>4.4.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.kyori</groupId>
+ <artifactId>adventure-api</artifactId>
+ <version>4.8.1</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>io.lumine</groupId>
+ <artifactId>Mythic-Dist</artifactId>
+ <version>4.14.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>LibsDisguises</groupId>
+ <artifactId>LibsDisguises</artifactId>
+ <version>10.0.24</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>me.clip</groupId>
+ <artifactId>placeholderapi</artifactId>
+ <version>2.10.9</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>nexus</id>
+ <url>https://mvn.lumine.io/repository/maven/</url>
+ </repository>
+ <repository>
+ <id>lumine-public</id>
+ <url>https://mvn.lumine.io/repository/maven-public/</url>
+ </repository>
+ <repository>
+ <id>spigot-repo</id>
+ <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ <repository>
+ <id>papermc</id>
+ <url>https://papermc.io/repo/repository/maven-public/</url>
+ </repository>
+ <repository>
+ <id>sk89q-repo</id>
+ <url>https://maven.sk89q.com/repo/</url>
+ </repository>
+ <repository>
+ <id>md_5-public</id>
+ <url>https://repo.md-5.net/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>md_5-snapshots</id>
+ <url>https://repo.md-5.net/content/repositories/snapshots/</url>
+ </repository>
+ <repository>
+ <id>placeholderapi</id>
+ <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
+ </repository>
+ <repository>
+ <id>filoghost-repo</id>
+ <url>https://ci.filoghost.me/plugin/repository/everything/</url>
+ </repository>
+ <repository>
+ <id>CodeMC</id>
+ <url>https://repo.codemc.org/repository/maven-public</url>
+ </repository>
+ <repository>
+ <id>jitpack.io</id>
+ <url>https://jitpack.io</url>
+ </repository>
+ <repository>
+ <id>lumine</id>
+ <url>https://mvn.lumine.io/repository/maven/</url>
+ </repository>
+ </repositories>
+</project>
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 1cc14a4..ce87ccf 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -23,14 +23,6 @@
<includes>
<include>plugin.yml</include>
<include>config.yml</include>
- <include>CachedMobs.yml</include>
- <include>ExampleDropTables.yml</include>
- <include>ExampleItems.yml</include>
- <include>ExampleMobs.yml</include>
- <include>VanillaMobs.yml</include>
- <include>ExampleRandomSpawns.yml</include>
- <include>ExampleSkills.yml</include>
- <include>readme.txt</include>
</includes>
</resource>
</resources>
@@ -39,8 +31,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>16</source>
+ <target>16</target>
</configuration>
</plugin>
<plugin>
diff --git a/plugin/src/main/java/io/lumine/cosmetics/commands/CommandHelper.java b/plugin/src/main/java/io/lumine/cosmetics/commands/CommandHelper.java
index e4ea79c..081b2c7 100644
--- a/plugin/src/main/java/io/lumine/cosmetics/commands/CommandHelper.java
+++ b/plugin/src/main/java/io/lumine/cosmetics/commands/CommandHelper.java
@@ -1,7 +1,7 @@
package io.lumine.cosmetics.commands;
+import io.lumine.utils.adventure.text.Component;
import io.lumine.utils.text.Text;
-import net.kyori.adventure.text.Component;
import org.bukkit.command.CommandSender;
--
GitLab