Skip to content
This repository has been archived by the owner on Feb 20, 2024. It is now read-only.

Commit

Permalink
Merge pull request #1 from TheWylot/dev/v2.0.0
Browse files Browse the repository at this point in the history
NEW RELEASE: 2.0.0
  • Loading branch information
TheWylot authored Jan 27, 2023
2 parents 07a3ae9 + c45a188 commit 20913cf
Show file tree
Hide file tree
Showing 72 changed files with 2,312 additions and 1,105 deletions.
2 changes: 1 addition & 1 deletion .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions WyCore.iml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<facet type="minecraft" name="Minecraft">
<configuration>
<autoDetectTypes>
<platformType>PAPER</platformType>
<platformType>ADVENTURE</platformType>
</autoDetectTypes>
</configuration>
Expand Down
227 changes: 181 additions & 46 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,67 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
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>ir.wy</groupId>
<artifactId>WyCore</artifactId>
<packaging>jar</packaging>
<version>0.7.3</version>
<version>2.0.1</version>


<properties>
<maven.compiler.source>16</maven.compiler.source>
<maven.compiler.target>16</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<kotlin.version>1.7.0</kotlin.version>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<artifactId>maven-shade-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<relocations>
<relocation>
<pattern>dev.triumphteam.gui</pattern>
<shadedPattern>ir.wy.wycore.spigot.gui</shadedPattern> <!-- Replace package here here -->
</relocation>
</relocations>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.1.1</version>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>test-compile</goal>
</goals>
</execution>
</executions>
<configuration>
<relocations>
<relocation>
<pattern>dev.triumphteam.gui</pattern>
<shadedPattern>ir.wy.wycore.gui</shadedPattern> <!-- Replace package here here -->
</relocation>
</relocations>
<jvmTarget>1.8</jvmTarget>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<executions>
<execution>
<phase>package</phase>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>shade</goal>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>testCompile</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
Expand Down Expand Up @@ -100,10 +125,6 @@
<id>codemc-releases</id>
<url>https://repo.codemc.io/repository/maven-releases/</url>
</repository>
<repository>
<id>iridiumdevelopment</id>
<url>https://nexus.iridiumdevelopment.net/repository/maven-releases/</url>
</repository>
<repository>
<id>codemc-repo</id>
<url>https://repo.codemc.org/repository/maven-public/</url>
Expand All @@ -113,6 +134,26 @@
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
<repository>
<id>mineacademy-repo</id>
<url>https://bitbucket.org/kangarko/libraries/raw/master</url>
</repository>
<repository>
<id>iridiumdevelopment</id>
<url>https://nexus.iridiumdevelopment.net/repository/maven-releases/</url>
</repository>
<repository>
<id>local-repo</id>
<url>file:///${project.basedir}/libs/</url>
</repository>
<repository>
<id>janmm14-public</id>
<url>https://repo.janmm14.de/repository/public/</url>
</repository>
<repository>
<id>essentials-releases</id>
<url>https://repo.essentialsx.net/releases/</url>
</repository>
</repositories>

<dependencies>
Expand All @@ -124,54 +165,148 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.13.2</version>
<version>2.14.0</version>
</dependency>
<dependency>
<groupId>de.janmm14</groupId>
<artifactId>aac-api</artifactId>
<version>5.0.0</version>
</dependency>
<dependency>
<groupId>com.github.MWHunter</groupId>
<artifactId>GrimAPI</artifactId>
<version>master</version>
</dependency>
<dependency>
<groupId>me.vagdedes</groupId>
<artifactId>SpartanAPI</artifactId>
<version>9.1</version>
<scope>system</scope>
<systemPath>${project.basedir}/libs/SpartanAPI.jar</systemPath>
</dependency>
<dependency>
<groupId>me.frep</groupId>
<artifactId>VulcanAPI</artifactId>
<version>2.6.9</version>
<scope>system</scope>
<systemPath>${project.basedir}/libs/Vulcan-2.6.9.jar</systemPath>
</dependency>
<dependency>
<groupId>net.essentialsx</groupId>
<artifactId>EssentialsX</artifactId>
<version>2.19.7</version>
<scope>system</scope>
<systemPath>${project.basedir}/libs/EssentialsX-2.19.7.jar</systemPath>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.2.1</version>
<version>2.14.0</version>
</dependency>
<dependency>
<groupId>com.github.Sparky-Tech</groupId>
<artifactId>SparkyAPIV2</artifactId>
<version>2.8</version>
<scope>system</scope>
<systemPath>${project.basedir}/libs/SparkyAPI.jar</systemPath>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.13.2</version>
<version>2.14.0</version>
</dependency>
<dependency>
<groupId>com.iridium</groupId>
<artifactId>IridiumColorAPI</artifactId>
<version>1.0.6</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
<version>2.13.2</version>
<version>2.14.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>2.13.2</version>
<version>2.14.0</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.22</version>
<scope>provided</scope>
<version>1.18.24</version>
</dependency>
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.18.1-R0.1-SNAPSHOT</version>
<version>1.19.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>me.filoghost.holographicdisplays</groupId>
<artifactId>holographicdisplays</artifactId>
<version>3.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/libs/HolographicDisplays.jar</systemPath>
</dependency>
<dependency>
<groupId>io.papermc</groupId>
<artifactId>paperlib</artifactId>
<version>1.0.7</version>
</dependency>
<dependency>
<groupId>com.iridium</groupId>
<artifactId>IridiumColorAPI</artifactId>
<version>LATEST</version>
</dependency>
<dependency>
<groupId>com.github.cryptomorin</groupId>
<artifactId>XSeries</artifactId>
<version>8.7.0</version>
<version>9.1.0</version>
</dependency>
<dependency>
<groupId>org.mineacademy.plugin</groupId>
<artifactId>CMI-API</artifactId>
<version>9.0.0.0</version>
</dependency>
<dependency>
<groupId>com.github.decentsoftware-eu</groupId>
<artifactId>decentholograms</artifactId>
<version>2.7.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.Zrips.CMILib</groupId>
<artifactId>CMILib</artifactId>
<version>2.3.7</version>
<scope>system</scope>
<systemPath>${project.basedir}/libs/CMILib1.2.3.7.jar</systemPath>
</dependency>
<dependency>
<groupId>org.mineacademy.plugin</groupId>
<artifactId>Multiverse-Core</artifactId>
<version>4.3.2-SNAPSHOT-870</version>
</dependency>
<dependency>
<groupId>org.mineacademy.plugin</groupId>
<artifactId>PlaceholderAPI</artifactId>
<version>2.11.1</version>
</dependency>
<dependency>
<groupId>org.mineacademy.plugin</groupId>
<artifactId>Vault</artifactId>
<version>1.7.3</version>
</dependency>
<dependency>
<groupId>org.mineacademy.plugin</groupId>
<artifactId>WorldEdit</artifactId>
<version>7.2.10</version>
</dependency>

<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin.version}</version>
</dependency>
</dependencies>

Expand Down
Loading

0 comments on commit 20913cf

Please sign in to comment.