Upstream/Advanced-Portals
1
0
Fork 0
mirror of https://github.com/sekwah41/Advanced-Portals.git synced 2024-09-29 23:57:36 +02:00
Code Issues Projects Releases Wiki Activity

Updated references for listener

Browse Source
This commit is contained in:
Sekwah 2018-06-06 15:02:28 +01:00
parent 7b9577b9a6
commit 9a86fe09fb
3 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
build.gradle
View File

@ -16,8 +16,8 @@ tasks.withType(JavaCompile) {
}
repositories {
maven { url "http://repo.maven.apache.org/maven2" }
maven { url "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" }
maven { url "http://repo.maven.apache.org/maven2" }
maven { url "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" }
}
configurations {
@ -38,14 +38,15 @@ jar {
from configurations.includeLibs.collect { it.isDirectory() ? it : zipTree(it) }
}
// Set SPIGOT_LOC to the location of your server and SPIGOT_JAR as the name of the jar file in the server you want to run
// DIReallyKnowWhatIAmDoingISwear is to remove the stupid pause spigot has at the start
task runJar() << {
javaexec {
main "-jar"
args "${System.env.MC_SERVER_LOC}\\${System.env.MC_SERVER_JAR}.jar"
jvmArgs "-DIReallyKnowWhatIAmDoingISwear=true"
workingDir "${System.env.MC_SERVER_LOC}"
task runJar() {
doLast {
javaexec {
main "-jar"
args "${System.env.MC_SERVER_LOC}\\${System.env.MC_SERVER_JAR}.jar"
jvmArgs "-DIReallyKnowWhatIAmDoingISwear=true"
workingDir "${System.env.MC_SERVER_LOC}"
}
}
}

11
src/main/java/com/sekwah/advancedportals/spigot/AdvancedPortalsPlugin.java
View File

@ -1,6 +1,9 @@
package com.sekwah.advancedportals.spigot;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.sekwah.advancedportals.core.AdvancedPortalsCore;
import com.sekwah.advancedportals.core.config.RepositoryModule;
import com.sekwah.advancedportals.core.data.DataStorage;
import com.sekwah.advancedportals.coreconnector.ConnectorDataCollector;
import com.sekwah.advancedportals.coreconnector.command.CommandRegister;
@ -10,11 +13,17 @@ public class AdvancedPortalsPlugin extends JavaPlugin {
private AdvancedPortalsCore portalsCore;
/**
* Readd this when the injector is actually needed.
*/
//private Injector injector;
public void onEnable() {
// TODO actually get the minecraft version
this.portalsCore = new AdvancedPortalsCore(new DataStorage(this.getDataFolder()),
new SpigotInfoLogger(this), new CommandRegister(this), new ConnectorDataCollector(), new int[]{1,12,2});
this.getServer().getPluginManager().registerEvents(new Listeners(this), this);
//injector = Guice.createInjector(new RepositoryModule(this.portalsCore));
this.getServer().getPluginManager().registerEvents(new Listeners(), this);
}
public void onDisable() {

18
src/main/java/com/sekwah/advancedportals/spigot/Listeners.java
View File

@ -1,5 +1,7 @@
package com.sekwah.advancedportals.spigot;
import com.google.inject.name.Named;
import com.sekwah.advancedportals.core.AdvancedPortalsCore;
import com.sekwah.advancedportals.core.CoreListeners;
import com.sekwah.advancedportals.core.entities.PortalLocation;
import com.sekwah.advancedportals.coreconnector.container.PlayerContainer;
@ -11,22 +13,24 @@ import org.bukkit.event.block.Action;
import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import javax.inject.Inject;
public class Listeners implements Listener {
private final AdvancedPortalsPlugin plugin;
private final CoreListeners coreListeners;
public Listeners(AdvancedPortalsPlugin plugin) {
this.plugin = plugin;
this.coreListeners = plugin.getPortalsCore().getCoreListeners();
}
private CoreListeners coreListeners = AdvancedPortalsCore.getCoreListeners();
@EventHandler
public void onJoinEvent(PlayerJoinEvent event) {
coreListeners.playerJoin(new PlayerContainer(event.getPlayer()));
}
@EventHandler
public void onJoinEvent(PlayerQuitEvent event) {
coreListeners.playerLeave(new PlayerContainer(event.getPlayer()));
}
@EventHandler(priority = EventPriority.HIGH)
public void onBlockPlace(BlockPlaceEvent event) {
if (!event.isCancelled()) {