Skip to content

Commit

Permalink
1.0.15
Browse files Browse the repository at this point in the history
  • Loading branch information
ZombieStriker committed May 16, 2019
1 parent f3de057 commit 632d20f
Show file tree
Hide file tree
Showing 38 changed files with 234 additions and 66 deletions.
23 changes: 23 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="F:/Minecraft Servers/SpigotLobby/Spigot.jar"/>
<classpathentry kind="lib" path="F:/Minecraft Servers/SpigotLobby/plugins/tempstuff/Multiverse-Core-2.5.0.jar"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/target/
23 changes: 23 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>WorldChangeScreenRemover</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
12 changes: 12 additions & 0 deletions .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7
4 changes: 4 additions & 0 deletions .settings/org.eclipse.m2e.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
2 changes: 2 additions & 0 deletions bin/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/changelog.txt
/plugin.yml
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/me/zombie_striker/wcsr/GithubUpdater$1.class
Binary file not shown.
Binary file added bin/me/zombie_striker/wcsr/GithubUpdater.class
Binary file not shown.
Binary file added bin/me/zombie_striker/wcsr/MagicPacketHolder$1.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/me/zombie_striker/wcsr/Main.class
Binary file not shown.
Binary file added bin/me/zombie_striker/wcsr/Updater$1.class
Binary file not shown.
Binary file added bin/me/zombie_striker/wcsr/Updater$Channel.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/me/zombie_striker/wcsr/Updater.class
Binary file not shown.
Binary file added bin/me/zombie_striker/wcsr/WCSRCommand.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
90 changes: 90 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
<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>me.zombie_striker</groupId>
<artifactId>WorldChangeScreenRemover</artifactId>
<version>1.0.15</version>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
<repository>
<id>dmulloy2-repo</id>
<url>http://repo.dmulloy2.net/nexus/repository/public/</url>
</repository>
<repository>
<id>placeholderapi</id>
<url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
</repository>
<repository>
<id>multiverse</id>
<url>http://repo.onarandombox.com/content/repositories/multiverse/</url>
</repository>
</repositories>


<dependencies>

<!--Spigot API -->
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>1.14.1-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

<!-- ProtocolLib -->
<dependency>
<groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib</artifactId>
<version>4.4.0</version>
</dependency>

<!--Multiverse-->
<dependency>
<groupId>com.onarandombox.multiversecore</groupId>
<artifactId>Multiverse-Core</artifactId>
<version>2.5</version>
</dependency>

<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.9.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<finalName>${project.name}</finalName>
<defaultGoal>install</defaultGoal>
<sourceDirectory>src</sourceDirectory>
<resources>
<resource>
<directory>${basedir}/resources</directory>
<filtering>true</filtering>
<includes>
<include>plugin.yml</include>
<include>config.yml</include>
</includes>
</resource>
<resource>
<directory>resources</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
110 changes: 57 additions & 53 deletions changelog.txt → resources/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,54 +1,58 @@
1.0.14
Fixed ping error

1.0.13
Fixed error on startup for deprecated packets

1.0.12
Added support for teleporting across worlds with different times or weather.

1.0.11
Fixed error for 1.13.2
Rewrote packet handler. Teleporting between worlds will no longer cause tearing between the two locations.

1.0.10
Added full 1.13 support

1.0.9
Added support for 1.8

1.0.8
Added support for potion effects.
Added support for delayed titles

1.0.7
Fixed alias problem.
Fixed double problem

1.0.6
Fixed updater time-out error.
Fixed NPE caused from missing PlaceholderAPI dependancy.
Added support for 'fade-in', 'fade-out', and 'stay' for title

1.0.5
Added /wcsr reload
Added support for aliases.

1.0.4
Fixed updater

1.0.3
Added titles when teleporting [Optional]
Added PlaceHolderAPI support
Fixed updater

1.0.2
//Bukkits multi-world system is extremely hacky
Fixed problem with Nether
Removeddebug messages

1.0.1
Fixed issue with nether/end

1.0.0
1.0.15
Updated to 1.14.
Updated to Maven

1.0.14
Fixed ping error

1.0.13
Fixed error on startup for deprecated packets

1.0.12
Added support for teleporting across worlds with different times or weather.

1.0.11
Fixed error for 1.13.2
Rewrote packet handler. Teleporting between worlds will no longer cause tearing between the two locations.

1.0.10
Added full 1.13 support

1.0.9
Added support for 1.8

1.0.8
Added support for potion effects.
Added support for delayed titles

1.0.7
Fixed alias problem.
Fixed double problem

1.0.6
Fixed updater time-out error.
Fixed NPE caused from missing PlaceholderAPI dependancy.
Added support for 'fade-in', 'fade-out', and 'stay' for title

1.0.5
Added /wcsr reload
Added support for aliases.

1.0.4
Fixed updater

1.0.3
Added titles when teleporting [Optional]
Added PlaceHolderAPI support
Fixed updater

1.0.2
//Bukkits multi-world system is extremely hacky
Fixed problem with Nether
Removeddebug messages

1.0.1
Fixed issue with nether/end

1.0.0
init post
18 changes: 9 additions & 9 deletions plugin.yml → resources/plugin.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
main: me.zombie_striker.wcsr.Main
version: 1.0.14
api-version: 1.13
name: WorldChangeScreenRemover
softdepend: [ProtocolLib, PlaceHolderAPI, Multiverse-Core]
author:
Zombie_Striker
commands:
wcsr:
main: me.zombie_striker.wcsr.Main
version: ${project.version}
api-version: 1.13
name: WorldChangeScreenRemover
softdepend: [ProtocolLib, PlaceHolderAPI, Multiverse-Core]
author:
Zombie_Striker
commands:
wcsr:
description: Controls the reload command
17 changes: 13 additions & 4 deletions src/me/zombie_striker/wcsr/MagicPacketHolder.java
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,12 @@ public void run() {
e.getPlayer().sendTitle(text, subtext, ((int) thi.fadeInSeconds * 20), ((int) thi.staySeconds * 20),
((int) thi.fadeOutSeconds * 20));
} catch (Error | Exception e4) {
e.getPlayer().sendTitle(thi.title, thi.subtitle, ((int) thi.fadeInSeconds * 20),
((int) thi.staySeconds * 20), ((int) thi.fadeOutSeconds * 20));
try {
e.getPlayer().sendTitle(thi.title, thi.subtitle, ((int) thi.fadeInSeconds * 20),
((int) thi.staySeconds * 20), ((int) thi.fadeOutSeconds * 20));
} catch (Error | Exception e412) {

}
}
}

Expand All @@ -379,9 +383,14 @@ public void run() {
e.getPlayer().sendTitle(text, subtext, ((int) thi.fadeInSeconds2 * 20),
((int) thi.staySeconds2 * 20), ((int) thi.fadeOutSeconds2 * 20));
} catch (Error | Exception e4) {
e.getPlayer().sendTitle(thi.title2, thi.subtitle2, ((int) thi.fadeInSeconds2 * 20),
((int) thi.staySeconds2 * 20), ((int) thi.fadeOutSeconds2 * 20));
try {
e.getPlayer().sendTitle(thi.title2, thi.subtitle2, ((int) thi.fadeInSeconds2 * 20),
((int) thi.staySeconds2 * 20), ((int) thi.fadeOutSeconds2 * 20));
} catch (Error | Exception e34) {

}
}

}

}.runTaskLater(thi, thi.delayedTitlesdelay);
Expand Down

0 comments on commit 632d20f

Please sign in to comment.