Skip to content

Commit

Permalink
Updating to 1.14.x
Browse files Browse the repository at this point in the history
  • Loading branch information
@mizpablito
mizpablito committed Jul 7, 2019
1 parent 72ad3ff commit d7bb14b
Show file tree
Hide file tree
Showing 18 changed files with 337 additions and 369 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ target/
release/
bin/
.vs/
.idea/
deps/craftbukkit.jar
*~
*.lock
*.DS_Store
*.swp
*.out
!*.elt
*.iml
1 change: 1 addition & 0 deletions jsonapi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ versions = {}
# versions['1.10.2'] = package: 'v1_10_R1', cb_version: '1.10.2-R0.1-SNAPSHOT'
versions['1.11.2'] = package: 'v1_11_R1', cb_version: '1.11.2-R0.1-SNAPSHOT'
versions['1.12'] = package: 'v1_12_R1', cb_version: '1.12-R0.1-SNAPSHOT'
versions['1.14.3'] = package: 'v1_14_R1', cb_version: '1.14.3-R0.1-SNAPSHOT'

# versions['1.4'] = versions['1.4.7']
# versions['1.5'] = versions['1.5.2']
Expand Down
233 changes: 117 additions & 116 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
<?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" 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>com.alecgorge.minecraft.jsonapi</groupId>
<artifactId>JSONAPI</artifactId>
<packaging>jar</packaging>
<version>${jsonapiVersion}-mc${spigotVersion}</version>
<name>JSONAPI</name>
<url>http://github.com/alecgorge/jsonapi</url>
<modelVersion>4.0.0</modelVersion>
<groupId>com.alecgorge.minecraft.jsonapi</groupId>
<artifactId>JSONAPI</artifactId>
<packaging>jar</packaging>
<version>${jsonapiVersion}-mc${spigotVersion}</version>
<name>JSONAPI</name>
<url>http://github.com/alecgorge/jsonapi</url>

<organization>
<name>Alec Gorge</name>
<url>http://alecgorge.com</url>
</organization>
<organization>
<name>Alec Gorge</name>
<url>http://alecgorge.com</url>
</organization>

<scm>
<developerConnection>scm:git:[email protected]:alecgorge/jsonapi.git</developerConnection>
<connection>scm:git:git://github.com/alecgorge/jsonapi.git</connection>
<url>https://github.com/alecgorge/jsonapi/tree/master/</url>
</scm>
<scm>
<developerConnection>scm:git:[email protected]:alecgorge/jsonapi.git</developerConnection>
<connection>scm:git:git://github.com/alecgorge/jsonapi.git</connection>
<url>https://github.com/alecgorge/jsonapi/tree/master/</url>
</scm>

<profiles>
<profile>
<id>default</id>
<properties>
<jsonapiVersion>BLEEDING</jsonapiVersion>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
</profiles>
<profiles>
<profile>
<id>default</id>
<properties>
<jsonapiVersion>BLEEDING</jsonapiVersion>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
</profiles>

<properties>
<spigotVersion>1.12-R0.1-SNAPSHOT</spigotVersion>
<mcPackage>v1_12_R1</mcPackage>
<properties>
<spigotVersion>1.14.3-R0.1-SNAPSHOT</spigotVersion>
<mcPackage>v1_14_R1</mcPackage>
<jsonapiDebug>no</jsonapiDebug>
</properties>
</properties>

<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
<repository>
<id>vault-repo</id>
<url>http://nexus.hc.to/content/repositories/pub_releases</url>
</repository>
<repository>
<id>dmulloy2-repo</id>
<url>http://repo.dmulloy2.net/content/groups/public/</url>
</repository>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
<repository>
<id>vault-repo</id>
<url>http://nexus.hc.to/content/repositories/pub_releases</url>
</repository>
<repository>
<id>dmulloy2-repo</id>
<url>http://repo.dmulloy2.net/nexus/repository/public/</url>
</repository>
<repository>
<id>ess-repo</id>
<url>http://repo.ess3.net/content/groups/essentials</url>
<url>https://ci.ender.zone/plugin/repository/everything/</url>
</repository>
</repositories>

Expand All @@ -63,79 +63,80 @@
<version>${spigotVersion}</version>
</dependency>
<!-- You should have it in your local .m2 repository -->
<!-- This can be done using BuildTools from spigotmc.org -->
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>${spigotVersion}</version>
<!-- <scope>system</scope>
<systemPath>${project.basedir}/test/spigot-latest.jar</systemPath> -->
</dependency>
<dependency>
<groupId>net.ess3</groupId>
<artifactId>Essentials</artifactId>
<version>2.14-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.igormaznitsa</groupId>
<artifactId>jcp</artifactId>
<version>5.3.2</version>
</dependency>
<dependency>
<groupId>net.milkbowl.vault</groupId>
<artifactId>Vault</artifactId>
<version>1.6.6</version>
</dependency>
<dependency>
<groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib</artifactId>
<version>4.3.0</version>
</dependency>
</dependencies>
<!-- This can be done using BuildTools from spigotmc.org -->
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>${spigotVersion}</version>
<scope>system</scope>
<systemPath>${project.basedir}/test/spigot-1.14.3-R0.1-SNAPSHOT.jar</systemPath>
</dependency>
<dependency>
<groupId>net.ess3</groupId>
<artifactId>EssentialsX</artifactId>
<version>2.16.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.igormaznitsa</groupId>
<artifactId>jcp</artifactId>
<version>5.3.2</version>
</dependency>
<dependency>
<groupId>net.milkbowl.vault</groupId>
<artifactId>Vault</artifactId>
<version>1.7.3</version>
</dependency>
<dependency>
<groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib-API</artifactId>
<version>4.4.0</version>
</dependency>
</dependencies>

<build>
<finalName>JSONAPI</finalName>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
<resource>
<directory>src/resources</directory>
<includes>
<include>plugin.yml</include>
<include>permission_nodes.yml</include>
<include>groups.json</include>
<include>users.yml</include>
<include>groups.yml</include>
<include>config.yml</include>
<include>config_rtk.yml</include>
<include>methods.json</include>
<include>methods/*</include>
<include>jsonapi4/methods/*</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>com.igormaznitsa</groupId>
<artifactId>jcp</artifactId>
<version>6.0.1</version>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>preprocess</goal>
</goals>
</execution>
</executions>
<configuration>
<globalVars>
<build>
<finalName>JSONAPI</finalName>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
<resource>
<directory>src/resources</directory>
<includes>
<include>plugin.yml</include>
<include>permission_nodes.yml</include>
<include>groups.json</include>
<include>users.yml</include>
<include>groups.yml</include>
<include>config.yml</include>
<include>config_rtk.yml</include>
<include>methods.json</include>
<include>methods/*</include>
<include>jsonapi4/methods/*</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>com.igormaznitsa</groupId>
<artifactId>jcp</artifactId>
<version>6.0.1</version>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>preprocess</goal>
</goals>
</execution>
</executions>
<configuration>
<globalVars>
<property>
<name>mcversion</name>
<value>${mcPackage}</value>
</property>
<property>
<name>mc1120rNewer</name>
<value>${mc1120rNewer}</value>
</property>
<property>
<name>mc1120rNewer</name>
<value>${mc1120rNewer}</value>
</property>
<!-- <property>
<name>mc16OrNewer</name>
<value>${mc16OrNewer}</value>
Expand All @@ -160,8 +161,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
<debug>true</debug>
<debuglevel>lines,vars,source</debuglevel>
Expand Down Expand Up @@ -287,4 +288,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
2 changes: 1 addition & 1 deletion src/main/java/com/alecgorge/minecraft/jsonapi/JSONAPI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ public void onEnable() {
startupDelay = yamlConfig.getInt("options.startup-delay", 2000);
anyoneCanUseCallAdmin = yamlConfig.getBoolean("options.anyone-can-use-calladmin", false);
allowSendingOldStreamMessages = yamlConfig.getBoolean("options.send-previous-stream-messages", true);
serverName = getServer().getServerName();
serverName = getServer().getName();
adminiumEnabled = yamlConfig.getBoolean("options.adminium-push-enabled", true);
if(yamlConfig.contains("options.use-new-api")) {
useGroups = yamlConfig.getBoolean("options.use-new-api", false);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/alecgorge/minecraft/jsonapi/adminium/Adminium3.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ public String getPushNotification() {

String messager = getMessage();
if (api.serverName != null && !api.serverName.isEmpty()) {
messager = (api.serverName.equals("default") ? api.getServer().getServerName() : api.serverName) + ": " + messager;
messager = (api.serverName.equals("default") ? api.getServer().getName() : api.serverName) + ": " + messager;
}

return messager.length() > 210 ? messager.substring(0, 208) + "\u2026" : messager;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/alecgorge/minecraft/jsonapi/adminium/PushNotificationDaemon.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public String getPushNotification() {

String messager = getMessage();
if (api.serverName != null && !api.serverName.isEmpty()) {
messager = (api.serverName.equals("default") ? api.getServer().getServerName() : api.serverName) + ": " + messager;
messager = (api.serverName.equals("default") ? api.getServer().getName() : api.serverName) + ": " + messager;
}

return messager.length() > 210 ? messager.substring(0, 208) + "\u2026" : messager;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/alecgorge/minecraft/jsonapi/api/StreamPusher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public void run() {

r.addPostValue("source", streamName);
r.addPostValue("count", messages.size());
r.addPostValue("server-name", JSONAPI.instance.getServer().getServerName());
r.addPostValue("server-name", JSONAPI.instance.getServer().getName());

if(getPushTag() != null) {
r.addPostValue("tag", getPushTag());
Expand Down
Loading

0 comments on commit d7bb14b

Please sign in to comment.