Skip to content

Commit

Permalink
Apply coding conventions
Browse files Browse the repository at this point in the history
  • Loading branch information
@AustinLMayes
AustinLMayes committed Aug 25, 2017
1 parent 0db1659 commit 250fb79
Show file tree
Hide file tree
Showing 10 changed files with 282 additions and 259 deletions.
4 changes: 3 additions & 1 deletion dependency-reduced-pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?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/maven-v4_0_0.xsd">
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>net.avicus</groupId>
<artifactId>grave</artifactId>
Expand Down
208 changes: 104 additions & 104 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,119 +1,119 @@
<?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>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
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>net.avicus</groupId>
<artifactId>grave</artifactId>
<version>1.8-SNAPSHOT</version>
<groupId>net.avicus</groupId>
<artifactId>grave</artifactId>
<version>1.8-SNAPSHOT</version>

<properties>
<plugin.name>Grave</plugin.name>
<plugin.mainClass>net.avicus.grave.GravePlugin</plugin.mainClass>
<project.description>Track entity and player deaths.</project.description>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<properties>
<plugin.name>Grave</plugin.name>
<plugin.mainClass>net.avicus.grave.GravePlugin</plugin.mainClass>
<project.description>Track entity and player deaths.</project.description>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<!-- Version Control -->
<scm>
<connection>scm:git://github.com/Avicus/Grave.git</connection>
<developerConnection>scm:git:ssh://github.com/Avicus/Grave.git</developerConnection>
<url>https://github.com/Avicus/Grave</url>
</scm>
<!-- Version Control -->
<scm>
<connection>scm:git://github.com/Avicus/Grave.git</connection>
<developerConnection>scm:git:ssh://github.com/Avicus/Grave.git</developerConnection>
<url>https://github.com/Avicus/Grave</url>
</scm>

<!-- Deployment -->
<distributionManagement>
<repository>
<id>avicus-repo</id>
<url>https://repo.avicus.net/content/repositories/releases/</url>
</repository>
<snapshotRepository>
<id>avicus-repo</id>
<url>https://repo.avicus.net/content/repositories/snapshots/</url>
</snapshotRepository>
</distributionManagement>
<!-- Deployment -->
<distributionManagement>
<repository>
<id>avicus-repo</id>
<url>https://repo.avicus.net/content/repositories/releases/</url>
</repository>
<snapshotRepository>
<id>avicus-repo</id>
<url>https://repo.avicus.net/content/repositories/snapshots/</url>
</snapshotRepository>
</distributionManagement>

<repositories>
<!-- PaperSpigot -->
<repository>
<id>avicus-public</id>
<url>https://repo.avicus.net/content/groups/public/</url>
</repository>
</repositories>
<repositories>
<!-- PaperSpigot -->
<repository>
<id>avicus-public</id>
<url>https://repo.avicus.net/content/groups/public/</url>
</repository>
</repositories>

<dependencies>
<!-- Lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.6</version>
<scope>provided</scope>
</dependency>
<dependencies>
<!-- Lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.6</version>
<scope>provided</scope>
</dependency>

<!-- Magner -->
<dependency>
<groupId>net.avicus</groupId>
<artifactId>magnet-api</artifactId>
<version>1.8.8-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- Magner -->
<dependency>
<groupId>net.avicus</groupId>
<artifactId>magnet-api</artifactId>
<version>1.8.8-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

<!-- Joda Time -->
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.9.2</version>
</dependency>
<!-- Joda Time -->
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.9.2</version>
</dependency>

<!-- Tracker -->
<dependency>
<groupId>tc.oc</groupId>
<artifactId>tracker</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
<!-- Tracker -->
<dependency>
<groupId>tc.oc</groupId>
<artifactId>tracker</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>

<!-- Build Settings -->
<build>
<sourceDirectory>${basedir}/src/main/java/</sourceDirectory>
<!-- Build Settings -->
<build>
<sourceDirectory>${basedir}/src/main/java/</sourceDirectory>

<!-- Resources -->
<resources>
<resource>
<targetPath>.</targetPath>
<filtering>true</filtering>
<directory>${basedir}/src/main/resources/</directory>
</resource>
</resources>
<!-- Resources -->
<resources>
<resource>
<targetPath>.</targetPath>
<filtering>true</filtering>
<directory>${basedir}/src/main/resources/</directory>
</resource>
</resources>

<plugins>
<!-- JAR creation plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugins>
<!-- JAR creation plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>

<!-- shading -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.1</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<!-- shading -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.1</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
17 changes: 9 additions & 8 deletions src/main/java/net/avicus/grave/GravePlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
import org.bukkit.plugin.java.JavaPlugin;

public class GravePlugin extends JavaPlugin {
@Override
public void onEnable() {
this.getServer().getPluginManager().registerEvents(new PlayerListener(this), this);
}

public <T extends Event> T callEvent(T event) {
this.getServer().getPluginManager().callEvent(event);
return event;
}
@Override
public void onEnable() {
this.getServer().getPluginManager().registerEvents(new PlayerListener(this), this);
}

public <T extends Event> T callEvent(T event) {
this.getServer().getPluginManager().callEvent(event);
return event;
}
}
34 changes: 17 additions & 17 deletions src/main/java/net/avicus/grave/event/EntityDeathByEntityEvent.java
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
package net.avicus.grave.event;

import java.util.List;
import lombok.ToString;
import org.bukkit.Location;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import org.bukkit.inventory.ItemStack;
import org.joda.time.Instant;
import tc.oc.tracker.Lifetime;

import java.util.List;

@ToString(callSuper = true)
public class EntityDeathByEntityEvent<T extends LivingEntity> extends EntityDeathEvent {
private final T cause;

public EntityDeathByEntityEvent(Entity entity, Location location, Lifetime lifetime, Instant time, List<ItemStack> drops, int droppedExp, T cause) {
super(entity, location, lifetime, time, drops, droppedExp);
this.cause = cause;
}
private final T cause;

public EntityDeathByEntityEvent(Entity entity, Location location, Lifetime lifetime, Instant time,
List<ItemStack> drops, int droppedExp, T cause) {
super(entity, location, lifetime, time, drops, droppedExp);
this.cause = cause;
}

public T getCause() {
return this.cause;
}
public static HandlerList getHandlerList() {
return handlers;
}

public static HandlerList getHandlerList() {
return handlers;
}
public T getCause() {
return this.cause;
}

public HandlerList getHandlers() {
return handlers;
}
public HandlerList getHandlers() {
return handlers;
}
}
24 changes: 12 additions & 12 deletions src/main/java/net/avicus/grave/event/EntityDeathByPlayerEvent.java
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
package net.avicus.grave.event;

import java.util.List;
import lombok.ToString;
import org.bukkit.Location;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import org.bukkit.inventory.ItemStack;
import org.joda.time.Instant;
import tc.oc.tracker.Lifetime;

import java.util.List;

@ToString(callSuper = true)
public class EntityDeathByPlayerEvent extends EntityDeathByEntityEvent<Player> {
public EntityDeathByPlayerEvent(Entity entity, Location location, Lifetime lifetime, Instant time, List<ItemStack> drops, int droppedExp, Player cause) {
super(entity, location, lifetime, time, drops, droppedExp, cause);
}

public static HandlerList getHandlerList() {
return handlers;
}
public EntityDeathByPlayerEvent(Entity entity, Location location, Lifetime lifetime, Instant time,
List<ItemStack> drops, int droppedExp, Player cause) {
super(entity, location, lifetime, time, drops, droppedExp, cause);
}

public static HandlerList getHandlerList() {
return handlers;
}

public HandlerList getHandlers() {
return handlers;
}
public HandlerList getHandlers() {
return handlers;
}
}
Loading

0 comments on commit 250fb79

Please sign in to comment.