Skip to content

Commit

Permalink
Updated for maven compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
@alkarinv
alkarinv committed Jan 24, 2014
1 parent 7eb7acf commit 226bef8
Show file tree
Hide file tree
Showing 7 changed files with 159 additions and 52 deletions.
4 changes: 2 additions & 2 deletions plugin.yml
View file
@@ -1,5 +1,5 @@
name: ArenaCTF
version: 1.2.6.5
name: ${project.name}
version: ${project.version}
author: Alkarin

description: Capture the flag event using Arenas
Expand Down
89 changes: 89 additions & 0 deletions pom.xml
View file
@@ -0,0 +1,89 @@
<?xml version="1.0"?>
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>mc.alk.arena</groupId>
<artifactId>ArenaCTF</artifactId>
<packaging>jar</packaging>
<version>1.2.7.1</version>
<name>ArenaCTF</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<url>http://maven.apache.org</url>
<!-- Locations for jar repositories -->
<repositories>
<repository>
<id>battleplugins-repo</id>
<url>http://server.battleplugins.com/maven/repository/</url>
</repository>
<repository>
<id>bukkit-repo</id>
<url>http://repo.bukkit.org/content/groups/public</url>
</repository>
</repositories>
<!-- Dependencies -->
<dependencies>
<!-- Dependencies that have maven repos -->
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.6.4-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>mc.alk</groupId>
<artifactId>BattleArena</artifactId>
<version>[3.9.4.8,)</version>
<scope>provided</scope>
</dependency>
<!-- unknown plugins that I had to add to the repo -->
<!-- test dependencies -->
</dependencies>
<!-- How we will compile the plugin -->
<build>
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>2.4</version>
</extension>
</extensions>
<defaultGoal>install</defaultGoal>
<!-- Where our source directory is -->
<sourceDirectory>${basedir}/src/java</sourceDirectory>
<!-- Include all the resources we need -->
<resources>
<resource>
<targetPath>.</targetPath>
<filtering>true</filtering>
<directory>${basedir}</directory>
</resource>
<!-- Exclude JUnit test directory -->
<resource>
<directory>src/test</directory>
<excludes>
<exclude>**/*</exclude>
</excludes>
</resource>
</resources>
<plugins>
<!-- Specify how we build the plugin.jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<phase>package</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
<distributionManagement>
<repository>
<id>battleplugins-repo</id>
<url>scp://server.battleplugins.com/var/www/server.battleplugins.com/htdocs/maven/repository</url>
</repository>
</distributionManagement>
</project>
0 src/mc/alk/ctf/CTF.java → src/java/mc/alk/ctf/CTF.java
View file
File renamed without changes.
32 changes: 18 additions & 14 deletions src/mc/alk/ctf/CTFArena.java → src/java/mc/alk/ctf/CTFArena.java
View file
@@ -1,14 +1,5 @@
package mc.alk.ctf;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;

import mc.alk.arena.BattleArena;
import mc.alk.arena.controllers.PlayerStoreController;
import mc.alk.arena.controllers.messaging.MatchMessageHandler;
Expand All @@ -21,7 +12,6 @@
import mc.alk.arena.serializers.Persist;
import mc.alk.arena.util.Log;
import mc.alk.arena.util.TeamUtil;

import org.bukkit.Bukkit;
import org.bukkit.Effect;
import org.bukkit.Location;
Expand All @@ -38,6 +28,15 @@
import org.bukkit.inventory.ItemStack;
import org.bukkit.util.Vector;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;

public class CTFArena extends Arena {
public static final boolean DEBUG = false;

Expand Down Expand Up @@ -145,7 +144,7 @@ public void run() {
@Override
public void run() {
for (Flag flag: flags.values()){
if (flag.isHome() && !flag.getEntity().isValid()){
if (flag.isHome() && !flag.isValid()){
spawnFlag(flag);
}
}
Expand Down Expand Up @@ -303,7 +302,7 @@ public void onPlayerMove(PlayerMoveEvent event){
ArenaPlayer ap = BattleArena.toArenaPlayer(event.getPlayer());
/// for some reason sometimes its not cleared in removeFlags
/// so do it explicitly now
try{event.getPlayer().getInventory().remove(f.is);}catch(Exception e){}
try{event.getPlayer().getInventory().remove(f.is);}catch(Exception e){ /* do nothing*/}
if (!teamScored(t,ap)){
removeFlag(capturedFlag);
spawnFlag(capturedFlag);
Expand All @@ -313,10 +312,14 @@ public void onPlayerMove(PlayerMoveEvent event){
params.put("{team}", t.getDisplayName());
params.put("{score}", score);
mmh.sendMessage("CaptureTheFlag.teamscored",params);

}
}

public void captured(ArenaPlayer player) {
ArenaTeam t = player.getTeam();
teamScored(t,player);
}

@ArenaEventHandler
public void onBlockPlace(BlockPlaceEvent event){
if (!flags.containsKey(event.getPlayer().getEntityId()))
Expand Down Expand Up @@ -445,9 +448,10 @@ public boolean valid(){
@Override
public List<String> getInvalidReasons(){
List<String> reasons = new ArrayList<String>();
if (flagSpawns == null || flagSpawns.size() < 2){
if (flagSpawns.size() < 2){
reasons.add("You need to add at least 2 flags!");}
reasons.addAll(super.getInvalidReasons());
return reasons;
}

}
7 changes: 7 additions & 0 deletions src/mc/alk/ctf/CTFExecutor.java → src/java/mc/alk/ctf/CTFExecutor.java
View file
@@ -1,6 +1,7 @@
package mc.alk.ctf;

import mc.alk.arena.BattleArena;
import mc.alk.arena.competition.match.Match;
import mc.alk.arena.executors.CustomCommandExecutor;
import mc.alk.arena.executors.MCCommand;
import mc.alk.arena.objects.ArenaPlayer;
Expand Down Expand Up @@ -34,4 +35,10 @@ public static boolean clearFlags(CommandSender sender, Arena arena) {
return sendMessage(sender,"&2Flags cleared for &6"+arena.getName());
}

@MCCommand(cmds={"capture"}, op=true)
public static boolean capture(CommandSender sender, ArenaPlayer player) {
Match m = BattleArena.getBAController().getMatch(player);
((CTFArena)m.getArena()).captured(player);
return sendMessage(sender,"&2Flag was captured by &6"+player.getName());
}
}
17 changes: 13 additions & 4 deletions src/mc/alk/ctf/Flag.java → src/java/mc/alk/ctf/Flag.java
View file
@@ -1,6 +1,7 @@
package mc.alk.ctf;

import mc.alk.arena.objects.teams.ArenaTeam;
import mc.alk.arena.util.EntityUtil;
import mc.alk.arena.util.InventoryUtil;
import mc.alk.arena.util.SerializerUtil;

Expand Down Expand Up @@ -37,11 +38,12 @@ public boolean sameFlag(ItemStack is2) {
return is.getType() == is2.getType() && is.getDurability() == is2.getDurability();
}

@Override
@SuppressWarnings("SimplifiableIfStatement")
@Override
public boolean equals(Object other) {
if (this == other) return true;
if (!(other instanceof Flag)) return false;
return this.hashCode() == ((Flag) other).hashCode();
return this.hashCode() == other.hashCode();
}

@Override
Expand All @@ -65,10 +67,17 @@ public void setHome(boolean home) {

@Override
public String toString(){
return String.format("[Flag %d: ent=%s, home=%s, team=%d, is=%s, homeloc=%s]",
id,ent == null ? "null" :ent.getType(),home,
return String.format("[Flag %d: ent=%s, home=%s, team=%s, is=%s, homeloc=%s]",
id,
ent == null ? "null" :ent.getType(),home,
team == null ? "null" : team.getId(),
is == null ? "null" : InventoryUtil.getItemString(is),
homeLocation==null? "null" : SerializerUtil.getLocString(homeLocation));
}

public boolean isValid() {
// return ent.isDead();
return EntityUtil.isValid()
return ent.isValid();
}
}
62 changes: 30 additions & 32 deletions src/mc/alk/ctf/FlagVictory.java → src/java/mc/alk/ctf/FlagVictory.java
View file
@@ -1,11 +1,5 @@
package mc.alk.ctf;

import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;

import mc.alk.arena.competition.match.Match;
import mc.alk.arena.controllers.messaging.MatchMessageHandler;
import mc.alk.arena.events.matches.MatchFindCurrentLeaderEvent;
Expand All @@ -21,10 +15,15 @@
import mc.alk.arena.objects.victoryconditions.VictoryCondition;
import mc.alk.arena.objects.victoryconditions.interfaces.DefinesLeaderRanking;
import mc.alk.arena.util.TimeUtil;

import org.bukkit.ChatColor;
import org.bukkit.entity.Player;

import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;

public class FlagVictory extends VictoryCondition implements DefinesLeaderRanking{

final ArenaObjective scores;
Expand Down Expand Up @@ -54,28 +53,27 @@ public String getScoreString() {
if (teams == null)
return "";
boolean first = true;
for (int i=0;i<teams.size();i++){
if (!first) sb.append(separator);
ArenaTeam t = teams.get(i);
Flag f = teamFlags.get(t);
Map<String,String> map2 = new HashMap<String,String>();
map2.put("{team}", t.getDisplayName());
map2.put("{captures}",scores.getPoints(t)+"");
map2.put("{maxcaptures}",capturesToWin+"");
String holder = null;
if (f.isHome()){
holder = mmh.getMessage("CaptureTheFlag.flaghome");
} else if (!(f.getEntity() instanceof Player)){
holder = mmh.getMessage("CaptureTheFlag.flagfloor");
} else {
Player p = (Player) f.getEntity();
holder = mmh.getMessage("CaptureTheFlag.flagperson") + p.getDisplayName();
}
map2.put("{flagholder}",holder);
String str = mmh.format(teamstr,map2);
sb.append(str);
first = false;
}
for (ArenaTeam team : teams) {
if (!first) sb.append(separator);
Flag f = teamFlags.get(team);
Map<String, String> map2 = new HashMap<String, String>();
map2.put("{team}", team.getDisplayName());
map2.put("{captures}", scores.getPoints(team) + "");
map2.put("{maxcaptures}", capturesToWin + "");
String holder;
if (f.isHome()) {
holder = mmh.getMessage("CaptureTheFlag.flaghome");
} else if (!(f.getEntity() instanceof Player)) {
holder = mmh.getMessage("CaptureTheFlag.flagfloor");
} else {
Player p = (Player) f.getEntity();
holder = mmh.getMessage("CaptureTheFlag.flagperson") + p.getDisplayName();
}
map2.put("{flagholder}", holder);
String str = mmh.format(teamstr, map2);
sb.append(str);
first = false;
}
map.put("{teamscores}",sb.toString());
return mmh.getMessage("CaptureTheFlag.score",map);
}
Expand Down Expand Up @@ -110,17 +108,17 @@ public void onMatchTimeExpiredMessage(MatchTimeExpiredMessageEvent event){
Map<String,String> map = new HashMap<String,String>();
match.setMatchResult(scores.getMatchResult(match));
map.put("{prefix}", match.getParams().getPrefix());
String node = null;
String node;
switch(match.getResult().getResult()){
case WIN:
for (ArenaTeam t: match.getResult().getVictors()){
sb.append(t.getDisplayName() +" ");
sb.append(t.getDisplayName()).append(" ");
}
node = "CaptureTheFlag.time_expired_win";
break;
case DRAW:
for (ArenaTeam t: match.getResult().getDrawers()){
sb.append(t.getDisplayName() +" ");
sb.append(t.getDisplayName()).append(" ");
}
node = "CaptureTheFlag.time_expired_draw";
break;
Expand Down

0 comments on commit 226bef8

Please sign in to comment.