Skip to content

Commit

Permalink
1.15.1 Full support
Browse files Browse the repository at this point in the history
  • Loading branch information
@cyberpwnn
cyberpwnn committed Jan 14, 2020
1 parent 541ab15 commit 21ebf89
Show file tree
Hide file tree
Showing 8 changed files with 71 additions and 104 deletions.
162 changes: 63 additions & 99 deletions dependency-reduced-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.volmit</groupId>
<artifactId>Mortar</artifactId>
<name>Mortar</name>
<version>1.0.74</version>
<version>1.0.75</version>
<description>That crap between the bricks</description>
<developers>
<developer>
Expand Down Expand Up @@ -140,10 +140,10 @@
<skip>false</skip>
<executable>C:\Users\cyberpwn\Documents\development\workspace\Mortar/scripts/doublecopy.bat</executable>
<arguments>
<argument>C:\Users\cyberpwn\Documents\development\workspace\Mortar\target\Mortar-1.0.74.jar</argument>
<argument>C:\Users\cyberpwn\Documents\development\workspace\Mortar\release\1.0.74\Mortar-1.0.74.jar</argument>
<argument>C:\Users\cyberpwn\Documents\development\workspace\Mortar\target\Mortar-1.0.75.jar</argument>
<argument>C:\Users\cyberpwn\Documents\development\workspace\Mortar\release\1.0.75\Mortar-1.0.75.jar</argument>
<argument>C:\Users\cyberpwn\Documents\development\workspace\Mortar\release\Mortar.jar</argument>
<argument>1.0.74</argument>
<argument>1.0.75</argument>
</arguments>
</configuration>
</execution>
Expand All @@ -152,10 +152,10 @@
<skip>false</skip>
<executable>C:\Users\cyberpwn\Documents\development\workspace\Mortar/scripts/doublecopy.bat</executable>
<arguments>
<argument>C:\Users\cyberpwn\Documents\development\workspace\Mortar\target\Mortar-1.0.74.jar</argument>
<argument>C:\Users\cyberpwn\Documents\development\workspace\Mortar\release\1.0.74\Mortar-1.0.74.jar</argument>
<argument>C:\Users\cyberpwn\Documents\development\workspace\Mortar\target\Mortar-1.0.75.jar</argument>
<argument>C:\Users\cyberpwn\Documents\development\workspace\Mortar\release\1.0.75\Mortar-1.0.75.jar</argument>
<argument>C:\Users\cyberpwn\Documents\development\workspace\Mortar\release\Mortar.jar</argument>
<argument>1.0.74</argument>
<argument>1.0.75</argument>
</arguments>
</configuration>
</plugin>
Expand All @@ -180,6 +180,10 @@
<id>central</id>
<url>https://raw.githubusercontent.com/cyberpwnn/Central/master/</url>
</repository>
<repository>
<id>volmit</id>
<url>http://nexus.volmit.com:8080/repository/volmit/</url>
</repository>
<repository>
<id>dmulloy2-repo</id>
<url>http://repo.dmulloy2.net/nexus/repository/public/</url>
Expand All @@ -196,28 +200,58 @@
</repositories>
<dependencies>
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId>
<version>1.12-SNAPSHOT</version>
<groupId>org.spigot</groupId>
<artifactId>spigot</artifactId>
<version>1.12.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.craftbukkit</groupId>
<artifactId>craftbukkit15</artifactId>
<version>15</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.craftbukkit</groupId>
<artifactId>craftbukkit14</artifactId>
<version>14</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.craftbukkit</groupId>
<artifactId>craftbukkit13</artifactId>
<version>13</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.craftbukkit</groupId>
<artifactId>craftbukkit12</artifactId>
<version>12</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.craftbukkit</groupId>
<artifactId>craftbukkit11</artifactId>
<version>11</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.craftbukkit</groupId>
<artifactId>craftbukkit10</artifactId>
<version>10</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.craftbukkit</groupId>
<artifactId>craftbukkit19</artifactId>
<version>19</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.craftbukkit</groupId>
<artifactId>craftbukkit18</artifactId>
<version>18</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>bungeecord-chat</artifactId>
<groupId>net.md-5</groupId>
</exclusion>
<exclusion>
<artifactId>bungeecord-config</artifactId>
<groupId>net.md-5</groupId>
</exclusion>
<exclusion>
<artifactId>bungeecord-event</artifactId>
<groupId>net.md-5</groupId>
</exclusion>
<exclusion>
<artifactId>bungeecord-protocol</artifactId>
<groupId>net.md-5</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.comphenix.protocol</groupId>
Expand Down Expand Up @@ -253,76 +287,6 @@
<version>1.18.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>cb</groupId>
<artifactId>spigot</artifactId>
<version>1</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/spigot-1.12.2.jar</systemPath>
</dependency>
<dependency>
<groupId>cb</groupId>
<artifactId>craftbukkit-1.14.2</artifactId>
<version>1</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/craftbukkit-1.14.2.jar</systemPath>
</dependency>
<dependency>
<groupId>cb</groupId>
<artifactId>craftbukkit-1.13</artifactId>
<version>1</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/craftbukkit-1.13.jar</systemPath>
</dependency>
<dependency>
<groupId>cb</groupId>
<artifactId>craftbukkit-1.13.2</artifactId>
<version>1</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/craftbukkit-1.13.2.jar</systemPath>
</dependency>
<dependency>
<groupId>cb</groupId>
<artifactId>craftbukkit-1.12.2</artifactId>
<version>1</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/craftbukkit-1.12.2.jar</systemPath>
</dependency>
<dependency>
<groupId>cb</groupId>
<artifactId>craftbukkit-1.11.2</artifactId>
<version>1</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/craftbukkit-1.11.2.jar</systemPath>
</dependency>
<dependency>
<groupId>cb</groupId>
<artifactId>craftbukkit-1.10.2</artifactId>
<version>1</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/craftbukkit-1.10.2.jar</systemPath>
</dependency>
<dependency>
<groupId>cb</groupId>
<artifactId>craftbukkit-1.9.4</artifactId>
<version>1</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/craftbukkit-1.9.4.jar</systemPath>
</dependency>
<dependency>
<groupId>cb</groupId>
<artifactId>craftbukkit-1.9.2</artifactId>
<version>1</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/craftbukkit-1.9.2.jar</systemPath>
</dependency>
<dependency>
<groupId>cb</groupId>
<artifactId>craftbukkit-1.8.8</artifactId>
<version>1</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/craftbukkit-1.8.8.jar</systemPath>
</dependency>
<dependency>
<groupId>cbx</groupId>
<artifactId>lightapi</artifactId>
Expand All @@ -341,7 +305,7 @@
<distributionManagement>
<repository>
<id>volmit</id>
<url>http://nexus.volmit.com/content/repositories/volmit</url>
<url>http://nexus.volmit.com:8080/repository/volmit/</url>
</repository>
</distributionManagement>
<properties>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.volmit</groupId>
<artifactId>Mortar</artifactId>
<version>1.0.74</version>
<version>1.0.75</version>
<name>Mortar</name>
<description>That crap between the bricks</description>
<developers>
Expand Down Expand Up @@ -350,7 +350,7 @@
<distributionManagement>
<repository>
<id>volmit</id>
<url>http://nexus.volmit.com/content/repositories/volmit</url>
<url>http://nexus.volmit.com:8080/repository/volmit/</url>
</repository>
</distributionManagement>
</project>
Binary file modified release/1.0.74/Mortar-1.0.74.jar
View file
Binary file not shown.
Binary file added release/1.0.75/Mortar-1.0.75.jar
View file
Binary file not shown.
Binary file modified release/Mortar.jar
View file
Binary file not shown.
3 changes: 3 additions & 0 deletions src/main/java/mortar/api/nms/Catalyst.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ private static CatalystHost getHost()
case R1_14:
D.as("NMP").v("Selected Catalyst:14");
return new Catalyst14();
case R1_15:
D.as("NMP").v("Selected Catalyst:15");
return new Catalyst15();
case R1_8:
D.as("NMP").v("Selected Catalyst:8");
return new Catalyst8();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/mortar/api/nms/Catalyst15.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,13 +215,13 @@ private BlockPosition toBlockPos(Location location)
@Override
public String getServerVersion()
{
return "1_14_R1";
return "1_15_R1";
}

@Override
public String getVersion()
{
return "1.14.X";
return "1.15.X";
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.74
1.0.75

0 comments on commit 21ebf89

Please sign in to comment.