New deploy & some javadoc fixes
This commit is contained in:
parent
4d9ad85b54
commit
d19b321438
Binary file not shown.
@ -1 +1 @@
|
|||||||
0f1b5a7d6e7451e0a606fb9c2fd7b145
|
3b1334c41e3a7fab70a4b9dedf3d2d6a
|
@ -1 +1 @@
|
|||||||
8a29df1b0bc844eb5098615c5d69febaefb50356
|
9f456511cf3dddd2d238d9f12e3ebc0dc00e02f8
|
@ -7,14 +7,16 @@
|
|||||||
<version>1.6.9.5-U0.2.1-RC-1.5-BETA</version>
|
<version>1.6.9.5-U0.2.1-RC-1.5-BETA</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>Factions</name>
|
<name>SavageFactions</name>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
|
<timestamp>${maven.build.timestamp}</timestamp>
|
||||||
|
<maven.build.timestamp.format>yyyy-MM-dd--HH-mm</maven.build.timestamp.format>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<defaultGoal>clean package install</defaultGoal>
|
<defaultGoal>clean install deploy</defaultGoal>
|
||||||
<finalName>${project.name}</finalName>
|
<finalName>${project.name}</finalName>
|
||||||
<sourceDirectory>src/main/java</sourceDirectory>
|
<sourceDirectory>src/main/java</sourceDirectory>
|
||||||
<resources>
|
<resources>
|
||||||
@ -67,7 +69,7 @@
|
|||||||
<artifactId>maven-jar-plugin</artifactId>
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
<version>2.3.2</version>
|
<version>2.3.2</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<finalName>SavageFactions-${project.version}</finalName>
|
<finalName>Factions-${maven.build.timestamp}</finalName>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
@ -1 +1 @@
|
|||||||
471dc814a99accc66a38e056aafa2177
|
17e6839e0ff447492c6ae777ccc92e4c
|
@ -1 +1 @@
|
|||||||
dceab45df9107b8d8db6241a89085aeefec56875
|
c550860888ccd4d325e3603fb0302deb07c22c72
|
@ -7,6 +7,6 @@
|
|||||||
<versions>
|
<versions>
|
||||||
<version>1.6.9.5-U0.2.1-RC-1.5-BETA</version>
|
<version>1.6.9.5-U0.2.1-RC-1.5-BETA</version>
|
||||||
</versions>
|
</versions>
|
||||||
<lastUpdated>20181216050532</lastUpdated>
|
<lastUpdated>20181220220357</lastUpdated>
|
||||||
</versioning>
|
</versioning>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
@ -1 +1 @@
|
|||||||
2a0616ebd85fb1a3a6550ebdc45182fc
|
2446c2ce3e973dde08e0d246410e2cd0
|
@ -1 +1 @@
|
|||||||
f48e4510711a6a15700754850c9707d07299b253
|
fc6e25aaeb2ec2b3581075cd2bfc657ada82045d
|
@ -98,7 +98,7 @@ public class CmdTnt extends FCommand {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (fme.getFaction().getTnt() < amount) {
|
if (fme.getFaction().getTnt() < amount) {
|
||||||
fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH);
|
fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH.toString());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
int fullStacks = amount / 64;
|
int fullStacks = amount / 64;
|
||||||
|
@ -47,11 +47,11 @@ public class CmdTntFill extends FCommand {
|
|||||||
int radius = argAsInt(0, 16);
|
int radius = argAsInt(0, 16);
|
||||||
int amount = argAsInt(1, 16);
|
int amount = argAsInt(1, 16);
|
||||||
if (radius > SavageFactions.plugin.getConfig().getInt("Tntfill.max-radius")) {
|
if (radius > SavageFactions.plugin.getConfig().getInt("Tntfill.max-radius")) {
|
||||||
msg(TL.COMMAND_TNTFILL_RADIUSMAX.toString().replace("{max}", SavageFactions.plugin.getConfig().getInt("Tntfill.max-radius") + ""));
|
fme.msg(TL.COMMAND_TNTFILL_RADIUSMAX.toString().replace("{max}", SavageFactions.plugin.getConfig().getInt("Tntfill.max-radius") + ""));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (amount > SavageFactions.plugin.getConfig().getInt("Tntfill.max-amount")) {
|
if (amount > SavageFactions.plugin.getConfig().getInt("Tntfill.max-amount")) {
|
||||||
msg(TL.COMMAND_TNTFILL_AMOUNTMAX.toString().replace("{max}", SavageFactions.plugin.getConfig().getInt("Tntfill.max-amount") + ""));
|
fme.msg(TL.COMMAND_TNTFILL_AMOUNTMAX.toString().replace("{max}", SavageFactions.plugin.getConfig().getInt("Tntfill.max-amount") + ""));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -80,7 +80,7 @@ public class CmdTntFill extends FCommand {
|
|||||||
int remainderAmt = amount % 64;
|
int remainderAmt = amount % 64;
|
||||||
if (!inventoryContains(me.getInventory(), new ItemStack(Material.TNT, amount))) {
|
if (!inventoryContains(me.getInventory(), new ItemStack(Material.TNT, amount))) {
|
||||||
if (!fme.getRole().isAtLeast(Role.MODERATOR)) {
|
if (!fme.getRole().isAtLeast(Role.MODERATOR)) {
|
||||||
msg(TL.COMMAND_TNTFILL_NOTENOUGH);
|
fme.msg(TL.COMMAND_TNTFILL_NOTENOUGH.toString());
|
||||||
sendMessage(TL.COMMAND_TNTFILL_SUCCESS.toString().replace("{amount}", amount + "").replace("{dispensers}", counter + ""));
|
sendMessage(TL.COMMAND_TNTFILL_SUCCESS.toString().replace("{amount}", amount + "").replace("{dispensers}", counter + ""));
|
||||||
me.updateInventory();
|
me.updateInventory();
|
||||||
return;
|
return;
|
||||||
@ -89,7 +89,7 @@ public class CmdTntFill extends FCommand {
|
|||||||
bankMode = true;
|
bankMode = true;
|
||||||
removeFromBank(amount);
|
removeFromBank(amount);
|
||||||
if (!inventoryContains(me.getInventory(), new ItemStack(Material.TNT, amount))) {
|
if (!inventoryContains(me.getInventory(), new ItemStack(Material.TNT, amount))) {
|
||||||
msg(TL.COMMAND_TNTFILL_NOTENOUGH);
|
fme.msg(TL.COMMAND_TNTFILL_NOTENOUGH.toString());
|
||||||
sendMessage(TL.COMMAND_TNTFILL_SUCCESS.toString().replace("{amount}", amount + "").replace("{dispensers}", counter + ""));
|
sendMessage(TL.COMMAND_TNTFILL_SUCCESS.toString().replace("{amount}", amount + "").replace("{dispensers}", counter + ""));
|
||||||
me.updateInventory();
|
me.updateInventory();
|
||||||
return;
|
return;
|
||||||
@ -135,17 +135,17 @@ public class CmdTntFill extends FCommand {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (fme.getFaction().getTnt() < amount) {
|
if (fme.getFaction().getTnt() < amount) {
|
||||||
fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH);
|
fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH.toString());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
int fullStacks = amount / 64;
|
int fullStacks = amount / 64;
|
||||||
int remainderAmt = amount % 64;
|
int remainderAmt = amount % 64;
|
||||||
if ((remainderAmt == 0 && getEmptySlots(me) <= fullStacks)) {
|
if ((remainderAmt == 0 && getEmptySlots(me) <= fullStacks)) {
|
||||||
fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH);
|
fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH.toString());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (getEmptySlots(me) + 1 <= fullStacks) {
|
if (getEmptySlots(me) + 1 <= fullStacks) {
|
||||||
fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH);
|
fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH.toString());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ItemStack tnt64 = new ItemStack(Material.TNT, 64);
|
ItemStack tnt64 = new ItemStack(Material.TNT, 64);
|
||||||
@ -190,7 +190,7 @@ public class CmdTntFill extends FCommand {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (getEmptySlots(me) + 1 <= fullStacks) {
|
if (getEmptySlots(me) + 1 <= fullStacks) {
|
||||||
fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH);
|
fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH.toString());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
@ -52,7 +52,7 @@ public enum PermissableAction {
|
|||||||
* Case insensitive check for action.
|
* Case insensitive check for action.
|
||||||
*
|
*
|
||||||
* @param check
|
* @param check
|
||||||
* @return
|
* @return - action
|
||||||
*/
|
*/
|
||||||
public static PermissableAction fromString(String check) {
|
public static PermissableAction fromString(String check) {
|
||||||
for (PermissableAction permissableAction : values()) {
|
for (PermissableAction permissableAction : values()) {
|
||||||
|
@ -84,7 +84,7 @@ public class TagUtil {
|
|||||||
* @param faction for faction (viewers faction)
|
* @param faction for faction (viewers faction)
|
||||||
* @param fme for player (viewer)
|
* @param fme for player (viewer)
|
||||||
* @param line fancy message prefix
|
* @param line fancy message prefix
|
||||||
* @return
|
* @return list of fancy msgs
|
||||||
*/
|
*/
|
||||||
public static List<FancyMessage> parseFancy(Faction faction, FPlayer fme, String line) {
|
public static List<FancyMessage> parseFancy(Faction faction, FPlayer fme, String line) {
|
||||||
for (TagReplacer tagReplacer : TagReplacer.getByType(TagType.FANCY)) {
|
for (TagReplacer tagReplacer : TagReplacer.getByType(TagType.FANCY)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user