Skip to content
This repository was archived by the owner on Jul 7, 2023. It is now read-only.

Commit b1b9bd1

Browse files
prosavageprosavage
committed
Reformatted Code
1 parent cd09e77 commit b1b9bd1

File tree

156 files changed

+1585
-1589
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+1585
-1589
lines changed

‎src/main/java/com/massivecraft/factions/Conf.java

+23-23
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class Conf {
3535
public static ChatColor colorWar = ChatColor.DARK_RED;
3636
// Power
3737
public static double powerPlayerMax = 10.0;
38-
public static double powerPlayerMin = -10.0;
38+
public static double powerPlayerMin = - 10.0;
3939
public static double powerPlayerStarting = 0.0;
4040
public static double powerPerMinute = 0.2; // Default health rate... it takes 5 min to heal one power
4141
public static double powerPerDeath = 4.0; // A death makes you lose 4 power
@@ -346,27 +346,27 @@ public class Conf {
346346
territoryEnemyDenyCommands.add("tpa");
347347

348348

349-
territoryProtectedMaterials.add(SavageFactions.plugin.WOODEN_DOOR);
350-
territoryProtectedMaterials.add(SavageFactions.plugin.TRAP_DOOR);
351-
territoryProtectedMaterials.add(SavageFactions.plugin.FENCE_GATE);
349+
territoryProtectedMaterials.add(SavageFactions.plugin.WOODEN_DOOR);
350+
territoryProtectedMaterials.add(SavageFactions.plugin.TRAP_DOOR);
351+
territoryProtectedMaterials.add(SavageFactions.plugin.FENCE_GATE);
352352
territoryProtectedMaterials.add(Material.DISPENSER);
353353
territoryProtectedMaterials.add(Material.CHEST);
354354
territoryProtectedMaterials.add(Material.FURNACE);
355-
territoryProtectedMaterials.add(SavageFactions.plugin.BURNING_FURNACE);
356-
territoryProtectedMaterials.add(SavageFactions.plugin.DIODE_BLOCK_OFF);
357-
territoryProtectedMaterials.add(SavageFactions.plugin.DIODE_BLOCK_ON);
355+
territoryProtectedMaterials.add(SavageFactions.plugin.BURNING_FURNACE);
356+
territoryProtectedMaterials.add(SavageFactions.plugin.DIODE_BLOCK_OFF);
357+
territoryProtectedMaterials.add(SavageFactions.plugin.DIODE_BLOCK_ON);
358358
territoryProtectedMaterials.add(Material.JUKEBOX);
359359
territoryProtectedMaterials.add(Material.BREWING_STAND);
360-
territoryProtectedMaterials.add(SavageFactions.plugin.ENCHANTMENT_TABLE);
360+
territoryProtectedMaterials.add(SavageFactions.plugin.ENCHANTMENT_TABLE);
361361
territoryProtectedMaterials.add(Material.CAULDRON);
362-
territoryProtectedMaterials.add(SavageFactions.plugin.ENCHANTMENT_TABLE);
362+
territoryProtectedMaterials.add(SavageFactions.plugin.ENCHANTMENT_TABLE);
363363
territoryProtectedMaterials.add(Material.BEACON);
364364
territoryProtectedMaterials.add(Material.ANVIL);
365365
territoryProtectedMaterials.add(Material.TRAPPED_CHEST);
366366
territoryProtectedMaterials.add(Material.DROPPER);
367367
territoryProtectedMaterials.add(Material.HOPPER);
368368

369-
territoryDenyUseageMaterials.add(SavageFactions.plugin.FIREBALL);
369+
territoryDenyUseageMaterials.add(SavageFactions.plugin.FIREBALL);
370370
territoryDenyUseageMaterials.add(Material.FLINT_AND_STEEL);
371371
territoryDenyUseageMaterials.add(Material.BUCKET);
372372
territoryDenyUseageMaterials.add(Material.WATER_BUCKET);
@@ -377,32 +377,32 @@ public class Conf {
377377
territoryDenyUseageMaterials.add(MultiversionMaterials.JUNGLE_BUTTON.parseMaterial());
378378
territoryDenyUseageMaterials.add(MultiversionMaterials.OAK_BUTTON.parseMaterial());
379379
territoryDenyUseageMaterials.add(MultiversionMaterials.STONE_BUTTON.parseMaterial());
380-
if (! SavageFactions.plugin.mc17) {
380+
if (! SavageFactions.plugin.mc17) {
381381
territoryDenyUseageMaterials.add(Material.ARMOR_STAND);
382382
}
383383

384384

385-
territoryProtectedMaterialsWhenOffline.add(SavageFactions.plugin.WOODEN_DOOR);
386-
territoryProtectedMaterialsWhenOffline.add(SavageFactions.plugin.TRAP_DOOR);
387-
territoryProtectedMaterialsWhenOffline.add(SavageFactions.plugin.FENCE_GATE);
385+
territoryProtectedMaterialsWhenOffline.add(SavageFactions.plugin.WOODEN_DOOR);
386+
territoryProtectedMaterialsWhenOffline.add(SavageFactions.plugin.TRAP_DOOR);
387+
territoryProtectedMaterialsWhenOffline.add(SavageFactions.plugin.FENCE_GATE);
388388
territoryProtectedMaterialsWhenOffline.add(Material.DISPENSER);
389389
territoryProtectedMaterialsWhenOffline.add(Material.CHEST);
390390
territoryProtectedMaterialsWhenOffline.add(Material.FURNACE);
391-
territoryProtectedMaterialsWhenOffline.add(SavageFactions.plugin.BURNING_FURNACE);
392-
territoryProtectedMaterialsWhenOffline.add(SavageFactions.plugin.DIODE_BLOCK_OFF);
393-
territoryProtectedMaterialsWhenOffline.add(SavageFactions.plugin.DIODE_BLOCK_OFF);
391+
territoryProtectedMaterialsWhenOffline.add(SavageFactions.plugin.BURNING_FURNACE);
392+
territoryProtectedMaterialsWhenOffline.add(SavageFactions.plugin.DIODE_BLOCK_OFF);
393+
territoryProtectedMaterialsWhenOffline.add(SavageFactions.plugin.DIODE_BLOCK_OFF);
394394
territoryProtectedMaterialsWhenOffline.add(Material.JUKEBOX);
395395
territoryProtectedMaterialsWhenOffline.add(Material.BREWING_STAND);
396-
territoryProtectedMaterialsWhenOffline.add(SavageFactions.plugin.ENCHANTMENT_TABLE);
396+
territoryProtectedMaterialsWhenOffline.add(SavageFactions.plugin.ENCHANTMENT_TABLE);
397397
territoryProtectedMaterialsWhenOffline.add(Material.CAULDRON);
398-
territoryProtectedMaterialsWhenOffline.add(SavageFactions.plugin.SOIL);
398+
territoryProtectedMaterialsWhenOffline.add(SavageFactions.plugin.SOIL);
399399
territoryProtectedMaterialsWhenOffline.add(Material.BEACON);
400400
territoryProtectedMaterialsWhenOffline.add(Material.ANVIL);
401401
territoryProtectedMaterialsWhenOffline.add(Material.TRAPPED_CHEST);
402402
territoryProtectedMaterialsWhenOffline.add(Material.DROPPER);
403403
territoryProtectedMaterialsWhenOffline.add(Material.HOPPER);
404404

405-
territoryDenyUseageMaterialsWhenOffline.add(SavageFactions.plugin.FIREBALL);
405+
territoryDenyUseageMaterialsWhenOffline.add(SavageFactions.plugin.FIREBALL);
406406
territoryDenyUseageMaterialsWhenOffline.add(Material.FLINT_AND_STEEL);
407407
territoryDenyUseageMaterialsWhenOffline.add(Material.BUCKET);
408408
territoryDenyUseageMaterialsWhenOffline.add(Material.WATER_BUCKET);
@@ -413,7 +413,7 @@ public class Conf {
413413
territoryDenyUseageMaterialsWhenOffline.add(MultiversionMaterials.JUNGLE_BUTTON.parseMaterial());
414414
territoryDenyUseageMaterialsWhenOffline.add(MultiversionMaterials.OAK_BUTTON.parseMaterial());
415415
territoryDenyUseageMaterialsWhenOffline.add(MultiversionMaterials.STONE_BUTTON.parseMaterial());
416-
if (! SavageFactions.plugin.mc17) {
416+
if (! SavageFactions.plugin.mc17) {
417417
territoryDenyUseageMaterialsWhenOffline.add(Material.ARMOR_STAND);
418418
}
419419
safeZoneNerfedCreatureTypes.add(EntityType.BLAZE);
@@ -434,11 +434,11 @@ public class Conf {
434434
}
435435

436436
public static void load() {
437-
SavageFactions.plugin.persist.loadOrSaveDefault(i, Conf.class, "conf");
437+
SavageFactions.plugin.persist.loadOrSaveDefault(i, Conf.class, "conf");
438438
}
439439

440440
public static void save() {
441-
SavageFactions.plugin.persist.save(i);
441+
SavageFactions.plugin.persist.save(i);
442442
}
443443

444444
public enum Backend {

‎src/main/java/com/massivecraft/factions/FLocation.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import java.util.Set;
1212

1313
public class FLocation implements Serializable {
14-
private static final long serialVersionUID = -8292915234027387983L;
14+
private static final long serialVersionUID = - 8292915234027387983L;
1515
private static final boolean worldBorderSupport;
1616

1717
static {
@@ -64,7 +64,7 @@ public FLocation(Block block) {
6464
//----------------------------------------------//
6565

6666
public static FLocation fromString(String string) {
67-
int index = string.indexOf(",", 0);
67+
int index = string.indexOf(",");
6868
int start = 1;
6969
String worldName = string.substring(start, index);
7070
start = index + 1;
@@ -99,10 +99,6 @@ public static int regionToChunk(int regionVal) {
9999
return regionVal << 5; // "<< 5" == "* 32"
100100
}
101101

102-
public Chunk getChunk(){
103-
return Bukkit.getWorld(worldName).getChunkAt(x, z);
104-
}
105-
106102
public static HashSet<FLocation> getArea(FLocation from, FLocation to) {
107103
HashSet<FLocation> ret = new HashSet<>();
108104

@@ -115,6 +111,10 @@ public static HashSet<FLocation> getArea(FLocation from, FLocation to) {
115111
return ret;
116112
}
117113

114+
public Chunk getChunk() {
115+
return Bukkit.getWorld(worldName).getChunkAt(x, z);
116+
}
117+
118118
public String getWorldName() {
119119
return worldName;
120120
}
@@ -191,7 +191,7 @@ public boolean isInChunk(Location loc) {
191191
* @return whether this location is outside of the border
192192
*/
193193
public boolean isOutsideWorldBorder(int buffer) {
194-
if (!worldBorderSupport) {
194+
if (! worldBorderSupport) {
195195
return false;
196196
}
197197

@@ -247,7 +247,7 @@ public boolean equals(Object obj) {
247247
if (obj == this) {
248248
return true;
249249
}
250-
if (!(obj instanceof FLocation)) {
250+
if (! (obj instanceof FLocation)) {
251251
return false;
252252
}
253253

‎src/main/java/com/massivecraft/factions/MassiveStats.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* @author Sam Jakob Harker, Brianna Hazel O'Keefe
3232
* @version 3.0
3333
*/
34-
@SuppressWarnings("all")
34+
@SuppressWarnings ("all")
3535
public class MassiveStats implements Listener {
3636

3737
/* START: MASSIVESTATS SETTINGS */
@@ -224,7 +224,7 @@ public void onPlayerJoin(PlayerJoinEvent event) {
224224
}
225225

226226
// and only notify operators - or players with the correct permission.
227-
if (!event.getPlayer().isOp() && !event.getPlayer().hasPermission(MassiveStats.MASSIVE_UPDATE_PERMISSION)) {
227+
if (! event.getPlayer().isOp() && ! event.getPlayer().hasPermission(MassiveStats.MASSIVE_UPDATE_PERMISSION)) {
228228
return;
229229
}
230230

@@ -258,7 +258,7 @@ class MassiveStatsUpdateTask extends BukkitRunnable {
258258
}
259259

260260
@Override
261-
@SuppressWarnings("all")
261+
@SuppressWarnings ("all")
262262
public void run() {
263263
try {
264264
// Generate the request payload and serialize it as JSON.
@@ -431,7 +431,7 @@ class MassiveStatsDataRequest {
431431
}
432432
}
433433

434-
@SuppressWarnings("all")
434+
@SuppressWarnings ("all")
435435
public String serialize() {
436436
//return object.toString();
437437
try {
@@ -446,7 +446,7 @@ public String serialize() {
446446

447447
}
448448

449-
@SuppressWarnings("unused")
449+
@SuppressWarnings ("unused")
450450
final class MassiveStatsDataResponse {
451451

452452
private final boolean isUpToDate;
@@ -456,7 +456,7 @@ final class MassiveStatsDataResponse {
456456
MassiveStatsDataResponse(boolean isUpToDate, String newVersion, String updateMessage) {
457457
this.isUpToDate = isUpToDate;
458458

459-
if (!isUpToDate) {
459+
if (! isUpToDate) {
460460
this.newVersion = newVersion;
461461
this.updateMessage = updateMessage;
462462
return;

‎src/main/java/com/massivecraft/factions/SavageFactions.java

+23-30
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,19 @@ public class SavageFactions extends MPlugin {
6060
public boolean mc113 = false;
6161
public boolean useNonPacketParticles = false;
6262
public boolean factionsFlight = false;
63-
63+
//multiversion material fields
64+
public Material SUGAR_CANE_BLOCK, BANNER, CROPS, REDSTONE_LAMP_ON,
65+
STAINED_GLASS, STATIONARY_WATER, STAINED_CLAY, WOOD_BUTTON,
66+
SOIL, MOB_SPANWER, THIN_GLASS, IRON_FENCE, NETHER_FENCE, FENCE,
67+
WOODEN_DOOR, TRAP_DOOR, FENCE_GATE, BURNING_FURNACE, DIODE_BLOCK_OFF,
68+
DIODE_BLOCK_ON, ENCHANTMENT_TABLE, FIREBALL;
6469
// Persistence related
6570
private boolean locked = false;
6671
private Integer AutoLeaveTask = null;
6772
private boolean hookedPlayervaults;
6873
private ClipPlaceholderAPIManager clipPlaceholderAPIManager;
6974
private boolean mvdwPlaceholderAPIManager = false;
7075

71-
7276
public SavageFactions() {
7377
plugin = this;
7478
}
@@ -114,15 +118,15 @@ public void onEnable() {
114118
// Vault dependency check.
115119
if (SavageFactions.plugin.getServer().getPluginManager().getPlugin("Vault") == null) {
116120
SavageFactions.plugin.log("Vault is not present, the plugin will not run properly.");
117-
this.onDisable();
118-
Bukkit.getScheduler().scheduleSyncDelayedTask(this,
119-
new Runnable() {
120-
@Override
121-
public void run() {
122-
SavageFactions.plugin.getServer().getPluginManager().disablePlugin(SavageFactions.plugin);
123-
}
124-
}, 20L);
125-
return;
121+
this.onDisable();
122+
Bukkit.getScheduler().scheduleSyncDelayedTask(this,
123+
new Runnable() {
124+
@Override
125+
public void run() {
126+
SavageFactions.plugin.getServer().getPluginManager().disablePlugin(SavageFactions.plugin);
127+
}
128+
}, 20L);
129+
return;
126130

127131
}
128132

@@ -141,7 +145,7 @@ public void run() {
141145
setupMultiversionMaterials();
142146
log("==== End Setup ====");
143147

144-
if (!preEnable()) {
148+
if (! preEnable()) {
145149
return;
146150
}
147151
this.loadSuccessful = false;
@@ -189,8 +193,6 @@ public void run() {
189193
new MassiveStats(this);
190194

191195

192-
193-
194196
if (version > 8) {
195197
useNonPacketParticles = true;
196198
SavageFactions.plugin.log("Minecraft Version 1.9 or higher found, using non packet based particle API");
@@ -201,7 +203,6 @@ public void run() {
201203
}
202204

203205

204-
205206
// Register Event Handlers
206207
getServer().getPluginManager().registerEvents(new FactionsPlayerListener(this), this);
207208
getServer().getPluginManager().registerEvents(new FactionsChatListener(this), this);
@@ -224,19 +225,11 @@ public void run() {
224225
}
225226

226227

227-
this.setupPlaceholderAPI();
228-
this.postEnable();
228+
this.setupPlaceholderAPI();
229+
this.postEnable();
229230
this.loadSuccessful = true;
230231
}
231232

232-
233-
//multiversion material fields
234-
public Material SUGAR_CANE_BLOCK, BANNER, CROPS, REDSTONE_LAMP_ON,
235-
STAINED_GLASS, STATIONARY_WATER, STAINED_CLAY, WOOD_BUTTON,
236-
SOIL, MOB_SPANWER, THIN_GLASS, IRON_FENCE, NETHER_FENCE, FENCE,
237-
WOODEN_DOOR, TRAP_DOOR, FENCE_GATE, BURNING_FURNACE, DIODE_BLOCK_OFF,
238-
DIODE_BLOCK_ON, ENCHANTMENT_TABLE, FIREBALL;
239-
240233
private void setupMultiversionMaterials() {
241234
if (mc113) {
242235
BANNER = Material.valueOf("LEGACY_BANNER");
@@ -263,7 +256,7 @@ private void setupMultiversionMaterials() {
263256
FIREBALL = Material.valueOf("LEGACY_FIREBALL");
264257

265258
} else {
266-
if (!mc17) {
259+
if (! mc17) {
267260
BANNER = Material.valueOf("BANNER");
268261
}
269262
CROPS = Material.valueOf("CROPS");
@@ -427,7 +420,7 @@ public void onDisable() {
427420

428421
public void startAutoLeaveTask(boolean restartIfRunning) {
429422
if (AutoLeaveTask != null) {
430-
if (!restartIfRunning) {
423+
if (! restartIfRunning) {
431424
return;
432425
}
433426
this.getServer().getScheduler().cancelTask(AutoLeaveTask);
@@ -547,7 +540,7 @@ public boolean isPlayerFactionChatting(Player player) {
547540
// TODO: GET THIS BACK AND WORKING
548541

549542
public boolean isFactionsCommand(String check) {
550-
return !(check == null || check.isEmpty()) && this.handleCommand(null, check, true);
543+
return ! (check == null || check.isEmpty()) && this.handleCommand(null, check, true);
551544
}
552545

553546
// Get a player's faction tag (faction name), mainly for usage by chat plugins for local/channel chat
@@ -569,7 +562,7 @@ public String getPlayerFactionTagRelation(Player speaker, Player listener) {
569562
}
570563

571564
// if listener isn't set, or config option is disabled, give back uncolored tag
572-
if (listener == null || !Conf.chatTagRelationColored) {
565+
if (listener == null || ! Conf.chatTagRelationColored) {
573566
tag = me.getChatTag().trim();
574567
} else {
575568
FPlayer you = FPlayers.getInstance().getByPlayer(listener);
@@ -648,7 +641,7 @@ public boolean isHookedPlayervaults() {
648641
}
649642

650643
public String getPrimaryGroup(OfflinePlayer player) {
651-
return perms == null || !perms.hasGroupSupport() ? " " : perms.getPrimaryGroup(Bukkit.getWorlds().get(0).toString(), player);
644+
return perms == null || ! perms.hasGroupSupport() ? " " : perms.getPrimaryGroup(Bukkit.getWorlds().get(0).toString(), player);
652645
}
653646

654647
public void debug(Level level, String s) {

‎src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,17 @@ public void perform() {
4040
boolean permAny = Permission.ADMIN_ANY.has(sender, false);
4141
Faction targetFaction = fyou.getFaction();
4242

43-
if (targetFaction != myFaction && !permAny) {
43+
if (targetFaction != myFaction && ! permAny) {
4444
msg(TL.COMMAND_ADMIN_NOTMEMBER, fyou.describeTo(fme, true));
4545
return;
4646
}
4747

48-
if (fme != null && fme.getRole() != Role.LEADER && ! permAny) {
48+
if (fme != null && fme.getRole() != Role.LEADER && ! permAny) {
4949
msg(TL.COMMAND_ADMIN_NOTADMIN);
5050
return;
5151
}
5252

53-
if (fyou == fme && !permAny) {
53+
if (fyou == fme && ! permAny) {
5454
msg(TL.COMMAND_ADMIN_TARGETSELF);
5555
return;
5656
}
@@ -83,7 +83,7 @@ public void perform() {
8383
if (admin != null) {
8484
admin.setRole(Role.COLEADER);
8585
}
86-
fyou.setRole(Role.LEADER);
86+
fyou.setRole(Role.LEADER);
8787
msg(TL.COMMAND_ADMIN_PROMOTES, fyou.describeTo(fme, true));
8888

8989
// Inform all players

0 commit comments

Comments
 (0)