Repo-Mirror/EcoEnchants
9
0
Fork 0
Code Issues Releases 1 Activity

Merge remote-tracking branch 'origin/master' into master

Browse Source
This commit is contained in:
Auxilor
2020-08-28 22:30:12 +01:00
parent cffa73da77 984059a84e
commit 96e53537e2
34 changed files with 78 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
.gitignore vendored
View File

@@ -1,8 +1,19 @@
# Project exclude paths
/API/target/
/Plugin/target/
/v1_15_R1/target/
/v1_16_R1/target/
/v1_16_R2/target/
/Plugin/src/main/java/com/willfp/ecoenchants/task/
/.idea/
# Java
*.class
# Eclipse IDE
.settings/
bin/
.classpath
.project
# IntelliJ IDEA
.idea/
*.iml
# Maven
target/
dependency-reduced-pom.xml
# Mac OSX
.DS_Store

13
API/API.iml
View File

@@ -1,12 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="minecraft" name="Minecraft">
<configuration>
<autoDetectTypes>
<platformType>SPIGOT</platformType>
</autoDetectTypes>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />

6
API/pom.xml
View File

@@ -10,15 +10,9 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<artifactId>API</artifactId>
<name>EcoEnchants API</name>
<packaging>jar</packaging>
<version>${project.parent.version}</version>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>

7
v1_15_R1/pom.xml → NMS/v1_15_R1/pom.xml
View File

@@ -6,21 +6,18 @@
<artifactId>parent</artifactId>
<groupId>com.willfp.ecoenchants</groupId>
<version>4.1.0-pre11</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>v1_15_R1</artifactId>
<properties>
<main.basedir>${project.parent.basedir}</main.basedir>
</properties>
<dependencies>
<dependency>
<groupId>com.willfp.ecoenchants</groupId>
<artifactId>API</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>

0
v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/BlockBreak.java → NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/BlockBreak.java
View File

0
v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/Cooldown.java → NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/Cooldown.java
View File

0
v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/CraftEnchantWrapper.java → NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/CraftEnchantWrapper.java
View File

0
v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/NMSEnchant.java → NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/NMSEnchant.java
View File

0
v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/NMSEnchantManager.java → NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/NMSEnchantManager.java
View File

0
v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/Target.java → NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/Target.java
View File

0
v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/TridentStack.java → NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/TridentStack.java
View File

7
v1_16_R1/pom.xml → NMS/v1_16_R1/pom.xml
View File

@@ -6,21 +6,18 @@
<artifactId>parent</artifactId>
<groupId>com.willfp.ecoenchants</groupId>
<version>4.1.0-pre11</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>v1_16_R1</artifactId>
<properties>
<main.basedir>${project.parent.basedir}</main.basedir>
</properties>
<dependencies>
<dependency>
<groupId>com.willfp.ecoenchants</groupId>
<artifactId>API</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>

0
v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/BlockBreak.java → NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/BlockBreak.java
View File

0
v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/Cooldown.java → NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/Cooldown.java
View File

0
v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/CraftEnchantWrapper.java → NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/CraftEnchantWrapper.java
View File

0
v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/NMSEnchant.java → NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/NMSEnchant.java
View File

0
v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/NMSEnchantManager.java → NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/NMSEnchantManager.java
View File

0
v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/Target.java → NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/Target.java
View File

0
v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/TridentStack.java → NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/TridentStack.java
View File

7
v1_16_R2/pom.xml → NMS/v1_16_R2/pom.xml
View File

@@ -6,21 +6,18 @@
<artifactId>parent</artifactId>
<groupId>com.willfp.ecoenchants</groupId>
<version>4.1.0-pre11</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>v1_16_R2</artifactId>
<properties>
<main.basedir>${project.parent.basedir}</main.basedir>
</properties>
<dependencies>
<dependency>
<groupId>com.willfp.ecoenchants</groupId>
<artifactId>API</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>

0
v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/BlockBreak.java → NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/BlockBreak.java
View File

0
v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/Cooldown.java → NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/Cooldown.java
View File

0
v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/CraftEnchantWrapper.java → NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/CraftEnchantWrapper.java
View File

0
v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/NMSEnchant.java → NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/NMSEnchant.java
View File

0
v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/NMSEnchantManager.java → NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/NMSEnchantManager.java
View File

0
v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/Target.java → NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/Target.java
View File

0
v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/TridentStack.java → NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/TridentStack.java
View File

23
Plugin/plugin.iml
View File

@@ -1,34 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="minecraft" name="Minecraft">
<configuration>
<autoDetectTypes>
<platformType>SPIGOT</platformType>
</autoDetectTypes>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$/../Expansions/src/main/java">
<sourceFolder url="file://$MODULE_DIR$/../Expansions/src/main/java" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../Expansions/src/main/resources">
<sourceFolder url="file://$MODULE_DIR$/../Expansions/src/main/resources" type="java-resource" />
</content>
<content url="file://$MODULE_DIR$/../Expansions/src/test/java">
<sourceFolder url="file://$MODULE_DIR$/../Expansions/src/test/java" isTestSource="true" />
</content>
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="API" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.15-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.13-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
<orderEntry type="library" name="Maven: com.willfp.ecoenchants:API:4.1.0-pre11" level="project" />
<orderEntry type="module" module-name="API" />
<orderEntry type="module" module-name="v1_15_R1" />
<orderEntry type="module" module-name="v1_16_R1" />
<orderEntry type="module" module-name="v1_16_R2" />

31
Plugin/pom.xml
View File

@@ -21,7 +21,6 @@
</properties>
<build>
<defaultGoal>clean package install</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -35,7 +34,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.2</version>
<version>3.2.4</version>
<executions>
<execution>
<phase>package</phase>
@@ -43,6 +42,28 @@
<goal>shade</goal>
</goals>
<configuration>
<artifactSet>
<excludes>org.codehaus.plexus:plexus-utils</excludes>
</artifactSet>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/</exclude>
</excludes>
</filter>
</filters>
<relocations>
<relocation>
<pattern>org.jetbrains.annotations</pattern>
<shadedPattern>com.willfp.ecoenchants.shaded.annotations</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.maven</pattern>
<shadedPattern>com.willfp.ecoenchants.shaded.maven</shadedPattern>
</relocation>
</relocations>
<minimizeJar>true</minimizeJar>
<createDependencyReducedPom>false</createDependencyReducedPom>
</configuration>
</execution>
@@ -70,7 +91,7 @@
<executions>
<execution>
<id>install-external-non-maven1-jar</id>
<phase>clean</phase>
<phase>compile</phase>
<configuration>
<repositoryLayout>default</repositoryLayout>
<groupId>n3kas.ae</groupId>
@@ -86,7 +107,7 @@
</execution>
<execution>
<id>install-external-non-maven2-jar</id>
<phase>clean</phase>
<phase>compile</phase>
<configuration>
<repositoryLayout>default</repositoryLayout>
<groupId>me.vagdedes</groupId>
@@ -153,12 +174,14 @@
<artifactId>worldguard-bukkit</artifactId>
<version>7.0.4-SNAPSHOT</version>
<scope>provided</scope>
<!--
<exclusions>
<exclusion>
<groupId>com.destroystokyo.paper</groupId>
<artifactId>paper-api</artifactId>
</exclusion>
</exclusions>
-->
</dependency>
<dependency>
<groupId>com.github.TechFortress</groupId>

3
parent.iml
View File

@@ -4,9 +4,6 @@
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />

17
pom.xml
View File

@@ -11,11 +11,11 @@
<name>EcoEnchants Parent</name>
<modules>
<module>Plugin</module>
<module>v1_15_R1</module>
<module>API</module>
<module>v1_16_R1</module>
<module>v1_16_R2</module>
<module>NMS/v1_15_R1</module>
<module>NMS/v1_16_R1</module>
<module>NMS/v1_16_R2</module>
<module>Plugin</module>
</modules>
<properties>
@@ -28,10 +28,6 @@
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>maven-central</id>
<url>https://repo1.maven.org/maven2/</url>
</repository>
<repository>
<id>CodeMC</id>
<url>https://repo.codemc.org/repository/maven-public</url>
@@ -68,9 +64,8 @@
<build>
<defaultGoal>clean package install</defaultGoal>
<finalName>${project.name} v${project.parent.version}</finalName>
<sourceDirectory>src/main/java</sourceDirectory>
<finalName>${project.name} v${project.version}</finalName>
<defaultGoal>clean install</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

24
v1_15_R1/v1_15_R1.iml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="API" />
<orderEntry type="library" name="Maven: com.willfp.ecoenchants:API:4.1.0-pre11" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.15-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.13-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.15-R0.1-SNAPSHOT" level="project" />
</component>
</module>

24
v1_16_R1/v1_16_R1.iml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="API" />
<orderEntry type="library" name="Maven: com.willfp.ecoenchants:API:4.1.0-pre11" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.16.1-R0.1-SNAPSHOT" level="project" />
</component>
</module>

24
v1_16_R2/v1_16_R2.iml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="API" />
<orderEntry type="library" name="Maven: com.willfp.ecoenchants:API:4.1.0-pre11" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.16.2-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.16.2-R0.1-SNAPSHOT" level="project" />
</component>
</module>