Skip to content

Commit 21ebf89

Browse files
cyberpwnncyberpwnn
committed
1.15.1 Full support
1 parent 541ab15 commit 21ebf89

File tree

8 files changed

+71
-104
lines changed

8 files changed

+71
-104
lines changed

‎dependency-reduced-pom.xml

Lines changed: 63 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.volmit</groupId>
55
<artifactId>Mortar</artifactId>
66
<name>Mortar</name>
7-
<version>1.0.74</version>
7+
<version>1.0.75</version>
88
<description>That crap between the bricks</description>
99
<developers>
1010
<developer>
@@ -140,10 +140,10 @@
140140
<skip>false</skip>
141141
<executable>C:\Users\cyberpwn\Documents\development\workspace\Mortar/scripts/doublecopy.bat</executable>
142142
<arguments>
143-
<argument>C:\Users\cyberpwn\Documents\development\workspace\Mortar\target\Mortar-1.0.74.jar</argument>
144-
<argument>C:\Users\cyberpwn\Documents\development\workspace\Mortar\release\1.0.74\Mortar-1.0.74.jar</argument>
143+
<argument>C:\Users\cyberpwn\Documents\development\workspace\Mortar\target\Mortar-1.0.75.jar</argument>
144+
<argument>C:\Users\cyberpwn\Documents\development\workspace\Mortar\release\1.0.75\Mortar-1.0.75.jar</argument>
145145
<argument>C:\Users\cyberpwn\Documents\development\workspace\Mortar\release\Mortar.jar</argument>
146-
<argument>1.0.74</argument>
146+
<argument>1.0.75</argument>
147147
</arguments>
148148
</configuration>
149149
</execution>
@@ -152,10 +152,10 @@
152152
<skip>false</skip>
153153
<executable>C:\Users\cyberpwn\Documents\development\workspace\Mortar/scripts/doublecopy.bat</executable>
154154
<arguments>
155-
<argument>C:\Users\cyberpwn\Documents\development\workspace\Mortar\target\Mortar-1.0.74.jar</argument>
156-
<argument>C:\Users\cyberpwn\Documents\development\workspace\Mortar\release\1.0.74\Mortar-1.0.74.jar</argument>
155+
<argument>C:\Users\cyberpwn\Documents\development\workspace\Mortar\target\Mortar-1.0.75.jar</argument>
156+
<argument>C:\Users\cyberpwn\Documents\development\workspace\Mortar\release\1.0.75\Mortar-1.0.75.jar</argument>
157157
<argument>C:\Users\cyberpwn\Documents\development\workspace\Mortar\release\Mortar.jar</argument>
158-
<argument>1.0.74</argument>
158+
<argument>1.0.75</argument>
159159
</arguments>
160160
</configuration>
161161
</plugin>
@@ -180,6 +180,10 @@
180180
<id>central</id>
181181
<url>https://raw.githubusercontent.com/cyberpwnn/Central/master/</url>
182182
</repository>
183+
<repository>
184+
<id>volmit</id>
185+
<url>http://nexus.volmit.com:8080/repository/volmit/</url>
186+
</repository>
183187
<repository>
184188
<id>dmulloy2-repo</id>
185189
<url>http://repo.dmulloy2.net/nexus/repository/public/</url>
@@ -196,28 +200,58 @@
196200
</repositories>
197201
<dependencies>
198202
<dependency>
199-
<groupId>net.md-5</groupId>
200-
<artifactId>bungeecord-api</artifactId>
201-
<version>1.12-SNAPSHOT</version>
203+
<groupId>org.spigot</groupId>
204+
<artifactId>spigot</artifactId>
205+
<version>1.12.2</version>
206+
<scope>provided</scope>
207+
</dependency>
208+
<dependency>
209+
<groupId>org.craftbukkit</groupId>
210+
<artifactId>craftbukkit15</artifactId>
211+
<version>15</version>
212+
<scope>provided</scope>
213+
</dependency>
214+
<dependency>
215+
<groupId>org.craftbukkit</groupId>
216+
<artifactId>craftbukkit14</artifactId>
217+
<version>14</version>
218+
<scope>provided</scope>
219+
</dependency>
220+
<dependency>
221+
<groupId>org.craftbukkit</groupId>
222+
<artifactId>craftbukkit13</artifactId>
223+
<version>13</version>
224+
<scope>provided</scope>
225+
</dependency>
226+
<dependency>
227+
<groupId>org.craftbukkit</groupId>
228+
<artifactId>craftbukkit12</artifactId>
229+
<version>12</version>
230+
<scope>provided</scope>
231+
</dependency>
232+
<dependency>
233+
<groupId>org.craftbukkit</groupId>
234+
<artifactId>craftbukkit11</artifactId>
235+
<version>11</version>
236+
<scope>provided</scope>
237+
</dependency>
238+
<dependency>
239+
<groupId>org.craftbukkit</groupId>
240+
<artifactId>craftbukkit10</artifactId>
241+
<version>10</version>
242+
<scope>provided</scope>
243+
</dependency>
244+
<dependency>
245+
<groupId>org.craftbukkit</groupId>
246+
<artifactId>craftbukkit19</artifactId>
247+
<version>19</version>
248+
<scope>provided</scope>
249+
</dependency>
250+
<dependency>
251+
<groupId>org.craftbukkit</groupId>
252+
<artifactId>craftbukkit18</artifactId>
253+
<version>18</version>
202254
<scope>provided</scope>
203-
<exclusions>
204-
<exclusion>
205-
<artifactId>bungeecord-chat</artifactId>
206-
<groupId>net.md-5</groupId>
207-
</exclusion>
208-
<exclusion>
209-
<artifactId>bungeecord-config</artifactId>
210-
<groupId>net.md-5</groupId>
211-
</exclusion>
212-
<exclusion>
213-
<artifactId>bungeecord-event</artifactId>
214-
<groupId>net.md-5</groupId>
215-
</exclusion>
216-
<exclusion>
217-
<artifactId>bungeecord-protocol</artifactId>
218-
<groupId>net.md-5</groupId>
219-
</exclusion>
220-
</exclusions>
221255
</dependency>
222256
<dependency>
223257
<groupId>com.comphenix.protocol</groupId>
@@ -253,76 +287,6 @@
253287
<version>1.18.4</version>
254288
<scope>provided</scope>
255289
</dependency>
256-
<dependency>
257-
<groupId>cb</groupId>
258-
<artifactId>spigot</artifactId>
259-
<version>1</version>
260-
<scope>system</scope>
261-
<systemPath>${project.basedir}/lib/spigot-1.12.2.jar</systemPath>
262-
</dependency>
263-
<dependency>
264-
<groupId>cb</groupId>
265-
<artifactId>craftbukkit-1.14.2</artifactId>
266-
<version>1</version>
267-
<scope>system</scope>
268-
<systemPath>${project.basedir}/lib/craftbukkit-1.14.2.jar</systemPath>
269-
</dependency>
270-
<dependency>
271-
<groupId>cb</groupId>
272-
<artifactId>craftbukkit-1.13</artifactId>
273-
<version>1</version>
274-
<scope>system</scope>
275-
<systemPath>${project.basedir}/lib/craftbukkit-1.13.jar</systemPath>
276-
</dependency>
277-
<dependency>
278-
<groupId>cb</groupId>
279-
<artifactId>craftbukkit-1.13.2</artifactId>
280-
<version>1</version>
281-
<scope>system</scope>
282-
<systemPath>${project.basedir}/lib/craftbukkit-1.13.2.jar</systemPath>
283-
</dependency>
284-
<dependency>
285-
<groupId>cb</groupId>
286-
<artifactId>craftbukkit-1.12.2</artifactId>
287-
<version>1</version>
288-
<scope>system</scope>
289-
<systemPath>${project.basedir}/lib/craftbukkit-1.12.2.jar</systemPath>
290-
</dependency>
291-
<dependency>
292-
<groupId>cb</groupId>
293-
<artifactId>craftbukkit-1.11.2</artifactId>
294-
<version>1</version>
295-
<scope>system</scope>
296-
<systemPath>${project.basedir}/lib/craftbukkit-1.11.2.jar</systemPath>
297-
</dependency>
298-
<dependency>
299-
<groupId>cb</groupId>
300-
<artifactId>craftbukkit-1.10.2</artifactId>
301-
<version>1</version>
302-
<scope>system</scope>
303-
<systemPath>${project.basedir}/lib/craftbukkit-1.10.2.jar</systemPath>
304-
</dependency>
305-
<dependency>
306-
<groupId>cb</groupId>
307-
<artifactId>craftbukkit-1.9.4</artifactId>
308-
<version>1</version>
309-
<scope>system</scope>
310-
<systemPath>${project.basedir}/lib/craftbukkit-1.9.4.jar</systemPath>
311-
</dependency>
312-
<dependency>
313-
<groupId>cb</groupId>
314-
<artifactId>craftbukkit-1.9.2</artifactId>
315-
<version>1</version>
316-
<scope>system</scope>
317-
<systemPath>${project.basedir}/lib/craftbukkit-1.9.2.jar</systemPath>
318-
</dependency>
319-
<dependency>
320-
<groupId>cb</groupId>
321-
<artifactId>craftbukkit-1.8.8</artifactId>
322-
<version>1</version>
323-
<scope>system</scope>
324-
<systemPath>${project.basedir}/lib/craftbukkit-1.8.8.jar</systemPath>
325-
</dependency>
326290
<dependency>
327291
<groupId>cbx</groupId>
328292
<artifactId>lightapi</artifactId>
@@ -341,7 +305,7 @@
341305
<distributionManagement>
342306
<repository>
343307
<id>volmit</id>
344-
<url>http://nexus.volmit.com/content/repositories/volmit</url>
308+
<url>http://nexus.volmit.com:8080/repository/volmit/</url>
345309
</repository>
346310
</distributionManagement>
347311
<properties>

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.volmit</groupId>
66
<artifactId>Mortar</artifactId>
7-
<version>1.0.74</version>
7+
<version>1.0.75</version>
88
<name>Mortar</name>
99
<description>That crap between the bricks</description>
1010
<developers>
@@ -350,7 +350,7 @@
350350
<distributionManagement>
351351
<repository>
352352
<id>volmit</id>
353-
<url>http://nexus.volmit.com/content/repositories/volmit</url>
353+
<url>http://nexus.volmit.com:8080/repository/volmit/</url>
354354
</repository>
355355
</distributionManagement>
356356
</project>

‎release/1.0.74/Mortar-1.0.74.jar

-32 KB
Binary file not shown.

‎release/1.0.75/Mortar-1.0.75.jar

8.32 MB
Binary file not shown.

‎release/Mortar.jar

-31.5 KB
Binary file not shown.

‎src/main/java/mortar/api/nms/Catalyst.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ private static CatalystHost getHost()
2727
case R1_14:
2828
D.as("NMP").v("Selected Catalyst:14");
2929
return new Catalyst14();
30+
case R1_15:
31+
D.as("NMP").v("Selected Catalyst:15");
32+
return new Catalyst15();
3033
case R1_8:
3134
D.as("NMP").v("Selected Catalyst:8");
3235
return new Catalyst8();

‎src/main/java/mortar/api/nms/Catalyst15.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,13 +215,13 @@ private BlockPosition toBlockPos(Location location)
215215
@Override
216216
public String getServerVersion()
217217
{
218-
return "1_14_R1";
218+
return "1_15_R1";
219219
}
220220

221221
@Override
222222
public String getVersion()
223223
{
224-
return "1.14.X";
224+
return "1.15.X";
225225
}
226226

227227
@Override

‎version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.74
1+
1.0.75

0 commit comments

Comments
 (0)