Merge remote-tracking branch 'refs/remotes/origin/master' into stable

Pante · Feb 23, 2020 · 06283b2 · 06283b2
2 parents 4a615c2 + 8ec64a0
commit 06283b2
Show file tree

Hide file tree

Showing 73 changed files with 4,283 additions and 1,451 deletions.
diff --git a/.gitignore b/.gitignore
@@ -54,9 +54,8 @@ Temporary Items
 /annotations/target/
 /commons/nbproject/
 /scribe/target/
-/scribe/f/target/
 /scribe/annotations/target/
-/scribe/scribe-maven-plugin/target/
-/scribe/scribe-standalone/target/
-/scribe/scribe-annotations/target/
+/scribe/core/target/
+/scribe/maven-plugin/target/
+/scribe/gradle-plugin/target/
 /scribe/standalone/target/
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: java
 sudo: required
-distro: bionic
+dist: bionic
 jdk:
   - openjdk11
 

diff --git a/README.md b/README.md
@@ -2,12 +2,13 @@
   <img src = "https://i.imgur.com/TA6hOBq.png">
 </p>
 
+Karus Labs' mono-repository for spigot libraries & tools. 
+* Allows Brigadier command framework usage in Spigot plugins. 
+* Compile-time plugin.yml generation tools.
 
-Open source spigot libraries & tools devloped by Karus Labs. Allows the Brigadier command framework to be used in Spigot plugins.
+**This is a bleeding edge version, please see the [stable branch](https://github.com/Pante/Chimera/tree/stable) for a production version. Requires Java 11+. [Why Java 11?](https://github.com/Pante/Chimera/wiki/faq#why-does-the-project-require-java-11-and-above)**
 
-**This is a bleeding edge version of Chimera, For a production ready version, please refer to the [stable branch](https://github.com/Pante/Chimera/tree/stable). For more information, please read the [wiki](https://github.com/Pante/Chimera/wiki).**
-
-**This project requires Java 11+ [Why Java 11?](https://github.com/Pante/Chimera/wiki/faq#why-does-the-project-require-java-11-and-above)**
+**Please read the [wiki](https://github.com/Pante/Chimera/wiki) to get started.**
 
 [![Travis-CI](https://img.shields.io/travis/pante/chimera/master?logo=travis)](https://travis-ci.com/Pante/Chimera)
 [![Funding](https://img.shields.io/badge/%F0%9F%A4%8D%20-sponsorship-ff69b4?style=flat-square)](https://github.com/sponsors/Pante)
@@ -16,37 +17,30 @@ Open source spigot libraries & tools devloped by Karus Labs. Allows the Brigadie
 [![Stable Source Code](https://img.shields.io/badge/stable-branch-blue.svg)](https://github.com/Pante/Chimera/tree/stable)
 [![Discord](https://img.shields.io/discord/140273735772012544.svg?style=flat-square)](https://discord.gg/uE4C9NQ)
 
-| Chimera Version | Minecraft Version                        |
-|-----------------|------------------------------------------|
-| 4.1.0           | 1.13.2                                   |
-| 4.2.0           | 1.14, 1.14.1, 1.4.2, 1.14.3, 1.14.4      |
-| 4.3.0           | 1.14, 1.14.1, 1.4.2, 1.14.3, 1.14.4      |
-| 4.4.0           | 1.15                                     |
+| Chimera Version | Minecraft Version |
+|-----------------|-------------------|
+| 4.5.0           | 1.15.2            |
+| 4.4.0           | 1.15 - 1.15.2     |
+| 4.3.0           | 1.14 - 1.14.4     |
+| 4.2.0           | 1.14 - 1.14.4     |
+| 4.1.0           | 1.13.2            |
 
 ***
 #### Annotations - Contains general purpose annotations
 [![releases-maven](https://img.shields.io/maven-metadata/v/https/repo.karuslabs.com/repository/chimera-releases/com/karuslabs/chimera/maven-metadata.xml.svg)](https://repo.karuslabs.com/service/rest/repository/browse/chimera-releases/com/karuslabs/annotations/)
 [![snapshots-maven](https://img.shields.io/maven-metadata/v/https/repo.karuslabs.com/repository/chimera-snapshots/com/karuslabs/chimera/maven-metadata.xml.svg)](https://repo.karuslabs.com/service/rest/repository/browse/chimera-snapshots/com/karuslabs/annotations/)
-[![javadoc](https://img.shields.io/badge/javadoc-4.4.0-brightgreen.svg)](https://repo.karuslabs.com/repository/chimera/4.4.0/annotations/apidocs/index.html)
+[![javadoc](https://img.shields.io/badge/javadoc-4.5.0-brightgreen.svg)](https://repo.karuslabs.com/repository/chimera/4.5.0/annotations/apidocs/index.html)
 ```XML
-
-<!-- Stable Builds -->
 <repository>
   <id>chimera-releases</id>
   <url>https://repo.karuslabs.com/repository/chimera-releases/</url>
 </repository>
 
-<!-- Nightly Builds -->
-<repository>
-  <id>chimera-snapshots</id>
-  <url>https://repo.karuslabs.com/repository/chimera-snapshots/</url>
-</repository>
-
 <dependencies>
   <dependency>
       <groupId>com.karuslabs</groupId>
       <artifactId>annotations</artifactId>
-      <version>4.4.0</version>
+      <version>4.5.0</version>
   </dependency>
 </dependencies>
 ```
@@ -55,88 +49,96 @@ Open source spigot libraries & tools devloped by Karus Labs. Allows the Brigadie
 #### Commons - Contains the command framework and other common utilities for Spigot plugin development
 [![releases-maven](https://img.shields.io/maven-metadata/v/https/repo.karuslabs.com/repository/chimera-releases/com/karuslabs/chimera/maven-metadata.xml.svg)](https://repo.karuslabs.com/service/rest/repository/browse/chimera-releases/com/karuslabs/commons)
 [![snapshots-maven](https://img.shields.io/maven-metadata/v/https/repo.karuslabs.com/repository/chimera-snapshots/com/karuslabs/chimera/maven-metadata.xml.svg)](https://repo.karuslabs.com/service/rest/repository/browse/chimera-snapshots/com/karuslabs/commons)
-[![javadoc](https://img.shields.io/badge/javadoc-4.4.0-brightgreen.svg)](https://repo.karuslabs.com/repository/chimera/4.4.0/commons/apidocs/index.html)
+[![javadoc](https://img.shields.io/badge/javadoc-4.5.0-brightgreen.svg)](https://repo.karuslabs.com/repository/chimera/4.5.0/commons/apidocs/index.html)
 ```XML
 
-<!-- Stable Builds -->
 <repository>
   <id>chimera-releases</id>
   <url>https://repo.karuslabs.com/repository/chimera-releases/</url>
 </repository>
 
-<!-- Nightly Builds -->
-<repository>
-  <id>chimera-snapshots</id>
-  <url>https://repo.karuslabs.com/repository/chimera-snapshots/</url>
-</repository>
-
 <dependencies>
   <dependency>
       <groupId>com.karuslabs</groupId>
       <artifactId>commons</artifactId>
-      <version>4.4.0</version>
+      <version>4.5.0</version>
   </dependency>
 </dependencies>
 ```
 
 ***
-### Scribe - A collection of compile-time annotation processors that generates a plugin.yml
-
 #### Scribe Annotations - Contains annotations that other scribe projects use to generate a plugin.yml
 [![releases-maven](https://img.shields.io/maven-metadata/v/https/repo.karuslabs.com/repository/chimera-releases/com/karuslabs/scribe-annotations/maven-metadata.xml.svg)](https://repo.karuslabs.com/service/rest/repository/browse/chimera-releases/com/karuslabs/scribe-annotations)
 [![snapshots-maven](https://img.shields.io/maven-metadata/v/https/repo.karuslabs.com/repository/chimera-snapshots/com/karuslabs/scribe-annotations/maven-metadata.xml.svg)](https://repo.karuslabs.com/service/rest/repository/browse/chimera-snapshots/com/karuslabs/scribe-annotations)
-[![javadoc](https://img.shields.io/badge/javadoc-4.4.0-brightgreen.svg)](https://repo.karuslabs.com/repository/chimera/4.4.0/scribe/scribe-annotations/apidocs/index.html)
+[![javadoc](https://img.shields.io/badge/javadoc-4.5.0-brightgreen.svg)](https://repo.karuslabs.com/repository/chimera/4.5.0/scribe/scribe-annotations/apidocs/index.html)
 
-**Since 4.4.0, the annotation processors are packaged separately under `scribe-standalone`.**
 ```XML
-
-<!-- Stable Builds -->
 <repository>
   <id>chimera-releases</id>
   <url>https://repo.karuslabs.com/repository/chimera-releases/</url>
 </repository>
 
-<!-- Nightly Builds -->
-<repository>
-  <id>chimera-snapshots</id>
-  <url>https://repo.karuslabs.com/repository/chimera-snapshots/</url>
-</repository>
-
 <dependencies>
   <dependency>
       <groupId>com.karuslabs</groupId>
       <artifactId>scribe-annotations</artifactId>
-      <version>4.4.0</version>
+      <version>4.5.0</version>
   </dependency>
 </dependencies>
 ```
-***
 
-#### Scribe Standalone
+***
+#### Scribe Standalone - Standalone annotation processor that generates a plugin.yml
 [![releases-maven](https://img.shields.io/maven-metadata/v/https/repo.karuslabs.com/repository/chimera-releases/com/karuslabs/scribe-standalone/maven-metadata.xml.svg)](https://repo.karuslabs.com/service/rest/repository/browse/chimera-releases/com/karuslabs/scribe-standalone)
 [![snapshots-maven](https://img.shields.io/maven-metadata/v/https/repo.karuslabs.com/repository/chimera-snapshots/com/karuslabs/scribe-standalone/maven-metadata.xml.svg)](https://repo.karuslabs.com/service/rest/repository/browse/chimera-snapshots/com/karuslabs/scribe-standalone)
-[![javadoc](https://img.shields.io/badge/javadoc-4.4.0-brightgreen.svg)](https://repo.karuslabs.com/repository/chimera/4.4.0/scribe/scribe-standalone/apidocs/index.html)
+[![javadoc](https://img.shields.io/badge/javadoc-4.5.0-brightgreen.svg)](https://repo.karuslabs.com/repository/chimera/4.5.0/scribe/scribe-standalone/apidocs/index.html)
 ```XML
-
-<!-- Stable Builds -->
 <repository>
   <id>chimera-releases</id>
   <url>https://repo.karuslabs.com/repository/chimera-releases/</url>
 </repository>
 
-<!-- Nightly Builds -->
-<repository>
-  <id>chimera-snapshots</id>
-  <url>https://repo.karuslabs.com/repository/chimera-snapshots/</url>
-</repository>
-
 <!-- Standalone annotation processor, provides scribe-annotations as a transitive dependency -->
 <dependencies>
   <dependency>
       <groupId>com.karuslabs</groupId>
       <artifactId>scribe-standalone</artifactId>
-      <version>4.4.0</version>
+      <version>4.5.0</version>
   </dependency>
 </dependencies>
 ```
+
 ***
+#### Scribe Maven Plugin - Maven plugin that generates a plugin.yml and infers values from a project's pom.xml
+[![releases-maven](https://img.shields.io/maven-metadata/v/https/repo.karuslabs.com/repository/chimera-releases/com/karuslabs/scribe-maven-plugin/maven-metadata.xml.svg)](https://repo.karuslabs.com/service/rest/repository/browse/chimera-releases/com/karuslabs/scribe-maven-plugin)
+[![snapshots-maven](https://img.shields.io/maven-metadata/v/https/repo.karuslabs.com/repository/chimera-snapshots/com/karuslabs/scribe-maven-plugin/maven-metadata.xml.svg)](https://repo.karuslabs.com/service/rest/repository/browse/chimera-snapshots/com/karuslabs/scribe-maven-plugin)
+[![javadoc](https://img.shields.io/badge/javadoc-4.5.0-brightgreen.svg)](https://repo.karuslabs.com/repository/chimera/4.5.0/scribe/scribe-maven-plugin/apidocs/index.html)
+```XML
+<repository>
+  <id>chimera-releases</id>
+  <url>https://repo.karuslabs.com/repository/chimera-releases/</url>
+</repository>
+
+<dependencies>
+  <dependency>
+    <groupId>com.karuslabs</groupId>
+    <artifactId>scribe-annotations</artifactId>
+    <version>4.5.0</version>
+  </dependency>
+</dependencies>
+
+<plugins>
+  <plugin>
+    <groupId>com.karuslabs</groupId>
+    <artifactId>scribe-maven-plugin</artifactId>
+    <version>4.5.0</version>
+    <executions>
+      <execution>
+        <goals>
+            <goal>scribe</goal>
+        </goals>
+      </execution>
+    </executions>
+  </plugin>
+</plugins>
+```
diff --git a/annotations/pom.xml b/annotations/pom.xml
@@ -4,14 +4,14 @@
     <parent>
         <groupId>com.karuslabs</groupId>
         <artifactId>chimera</artifactId>
-        <version>4.4.0</version>
+        <version>4.5.0</version>
     </parent>
 
     <artifactId>annotations</artifactId>
     <packaging>jar</packaging>
 
     <name>Annotations</name>
-    <description>Karus Lab's annotations and annotation processors</description>
+    <description>Annotations and annotation processors</description>
 
     <build>
         <defaultGoal>clean package install</defaultGoal>
@@ -25,16 +25,15 @@
             </plugin>
 
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.2.2</version>
                 <configuration>
                     <shadedArtifactAttached>true</shadedArtifactAttached>
                     <shadedClassifierName>shaded</shadedClassifierName>
+                    <minimizeJar>true</minimizeJar>
                 </configuration>
                 <executions>
                     <execution>
-                        <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
                         </goals>
@@ -58,20 +57,13 @@
                     <execution>
                         <goals>
                             <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>report</id>
-                        <phase>prepare-package</phase>
-                        <goals>
                             <goal>report</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
 
             <plugin> 
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.1.1</version>
                 <configuration>
@@ -80,18 +72,10 @@
                 </configuration>
                 <executions>
                     <execution>
-                        <id>generate-javadoc</id>
-                        <phase>deploy</phase>
                         <goals>
                             <goal>javadoc</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <phase>deploy</phase>
-                        <goals>
                             <goal>jar</goal>
-                        </goals> 
+                        </goals>
                     </execution>
                 </executions> 
             </plugin>
@@ -101,9 +85,7 @@
                 <artifactId>maven-deploy-plugin</artifactId> 
                 <version>2.8.2</version>
                 <executions> 
-                    <execution> 
-                        <id>deploy</id>
-                        <phase>deploy</phase>
+                    <execution>
                         <goals>
                             <goal>deploy</goal>
                         </goals> 
@@ -112,7 +94,6 @@
             </plugin>
 
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
                 <version>3.7.1</version>
                 <dependencies>
@@ -125,7 +106,6 @@
             </plugin>
 
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
                 <version>3.0.0</version>
             </plugin> 

diff --git a/annotations/src/main/java/com/karuslabs/annotations/filters/ClassFilter.java b/annotations/src/main/java/com/karuslabs/annotations/filters/ClassFilter.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License
  *
- * Copyright 2019 Matthias.
+ * Copyright 2019 Karus Labs.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/annotations/src/main/java/com/karuslabs/annotations/filters/ModuleFilter.java b/annotations/src/main/java/com/karuslabs/annotations/filters/ModuleFilter.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License
  *
- * Copyright 2019 Matthias.
+ * Copyright 2019 Karus Labs.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/annotations/src/main/java/com/karuslabs/annotations/filters/PackageFilter.java b/annotations/src/main/java/com/karuslabs/annotations/filters/PackageFilter.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License
  *
- * Copyright 2019 Matthias.
+ * Copyright 2019 Karus Labs.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/annotations/src/main/java/com/karuslabs/annotations/processors/AnnotationProcessor.java b/annotations/src/main/java/com/karuslabs/annotations/processors/AnnotationProcessor.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License
  *
- * Copyright 2019 Matthias.
+ * Copyright 2019 Karus Labs.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal