EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove more unimportant configuration options

Browse Source
This commit is contained in:
Magnus Ulf
2019-01-24 11:22:39 +01:00
parent 8d9392eb87
commit c89ee61b34
5 changed files with 9 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/com/massivecraft/factions/cmd/CmdFactionsXPlaceholder.java
View File

@@ -1,43 +0,0 @@
package com.massivecraft.factions.cmd;
public class CmdFactionsXPlaceholder extends FactionsCommand
{
// -------------------------------------------- //
// FIELDS
// -------------------------------------------- //
public String extensionName;
// -------------------------------------------- //
// CONSTRUCT
// -------------------------------------------- //
public CmdFactionsXPlaceholder(String extensionName, String... aliases)
{
// Fields
this.extensionName = extensionName;
this.setSetupEnabled(false);
// Aliases
this.addAliases(aliases);
// Desc
this.setDesc("Use " + extensionName);
// Parameters
this.setOverflowSensitive(false);
}
// -------------------------------------------- //
// OVERRIDE
// -------------------------------------------- //
@Override
public void perform()
{
msg("<b>The extension <h>%s <b>isn't installed.", this.extensionName);
msg("<g>Learn more and download the extension here:");
msg("<aqua>https://www.massivecraft.com/%s", this.extensionName.toLowerCase());
}
}

1
src/com/massivecraft/factions/engine/EngineChat.java
View File

@@ -39,6 +39,7 @@ public class EngineChat extends Engine
if (MConf.get().chatSetFormat)
{
Bukkit.getPluginManager().registerEvent(AsyncPlayerChatEvent.class, this, MConf.get().chatSetFormatAt, new SetFormatEventExecutor(), Factions.get(), true);
}

15
src/com/massivecraft/factions/engine/EngineSeeChunk.java
View File

@@ -1,6 +1,5 @@
package com.massivecraft.factions.engine;
import com.massivecraft.factions.entity.MConf;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.massivecore.Engine;
import com.massivecraft.massivecore.event.EventMassiveCorePlayerLeave;
@@ -67,22 +66,22 @@ public class EngineSeeChunk extends Engine
{
// Do we have a new period?
final long now = System.currentTimeMillis();
final long length = MConf.get().seeChunkPeriodMillis;
final long length = 500;
if ( ! PeriodUtil.isNewPeriod(this, length, now)) return;
// Get the period number
final long period = PeriodUtil.getPeriod(length, now);
// Calculate the "step" from the period number
final int steps = MConf.get().seeChunkSteps; // Example: 4
final int steps = 1; // Example: 4
final int step = (int) (period % steps); // Example: 0, 1, 2, 3
// Load other related config options
final float offsetX = 0.0f;
final float offsetY = MConf.get().seeChunkParticleOffsetY;
final float offsetY = 2;
final float offsetZ = 0.0f;
final float speed = 0;
final int amount = MConf.get().seeChunkParticleAmount;
final int amount = 30;
// For each player
for (Player player : MUtil.getOnlinePlayers())
@@ -120,14 +119,14 @@ public class EngineSeeChunk extends Engine
final int xmin = chunk.getChunkX() * 16;
final int xmax = xmin + 15;
final double y = location.getBlockY() + MConf.get().seeChunkParticleDeltaY;
final double y = location.getBlockY() + 2;
final int zmin = chunk.getChunkZ() * 16;
final int zmax = zmin + 15;
int keepEvery = MConf.get().seeChunkKeepEvery;
int keepEvery = 5;
if (keepEvery <= 0) keepEvery = Integer.MAX_VALUE;
int skipEvery = MConf.get().seeChunkSkipEvery;
int skipEvery = 0;
if (skipEvery <= 0) skipEvery = Integer.MAX_VALUE;
int x = xmin;

5
src/com/massivecraft/factions/entity/Faction.java
View File

@@ -189,11 +189,6 @@ public class Faction extends Entity<Faction> implements FactionsParticipator, MP
{
String ret = this.name;
if (MConf.get().factionNameForceUpperCase)
{
ret = ret.toUpperCase();
}
return ret;
}

51
src/com/massivecraft/factions/entity/MConf.java
View File

@@ -96,7 +96,6 @@ public class MConf extends Entity<MConf>
// Define the time in minutes between certain Factions system tasks is ran.
public double taskPlayerPowerUpdateMinutes = 1;
public double taskPlayerDataRemoveMinutes = 5;
public double taskEconLandRewardMinutes = 20;
// -------------------------------------------- //
@@ -187,12 +186,7 @@ public class MConf extends Entity<MConf>
// Limit the length of faction names here.
public int factionNameLengthMin = 3;
public int factionNameLengthMax = 16;
// Should faction names automatically be converted to upper case?
// You probably don't want this feature.
// It's a remnant from old faction versions.
public boolean factionNameForceUpperCase = false;
// -------------------------------------------- //
// SET LIMITS
// -------------------------------------------- //
@@ -276,19 +270,6 @@ public class MConf extends Entity<MConf>
// Choose between: LOWEST, LOW, NORMAL, HIGH, HIGHEST and MONITOR.
public EventPriority homesTeleportToOnDeathPriority = EventPriority.NORMAL;
// -------------------------------------------- //
// PERMS
// -------------------------------------------- //
/*public List<String> defaultPermsEnemy = MUtil.list(MPerm.ID_DEPOSIT);
public List<String> defaultPermsNeutral = MUtil.list(MPerm.ID_DEPOSIT);
public List<String> defaultPermsTruce = MUtil.list(MPerm.ID_DEPOSIT);
public List<String> defaultPermsAlly = MUtil.list(MPerm.ID_DOOR, MPerm.ID_BUTTON, MPerm.ID_LEVER, MPerm.ID_HOME, MPerm.ID_CLAIMNEAR);
public List<String> defaultPermsRecruit = MUtil.list(MPerm.ID_DOOR, MPerm.ID_BUTTON, MPerm.ID_LEVER, MPerm.ID_LEVER, MPerm.ID_HOME, MPerm.ID_CLAIMNEAR);
public List<String> defaultPermsMember = MUtil.list(MPerm.ID_BUILD, MPerm.ID_DOOR, MPerm.ID_BUTTON, MPerm.ID_LEVER, MPerm.ID_LEVER, MPerm.ID_CONTAINER, MPerm.ID_HOME, MPerm.ID_CLAIMNEAR);
public List<String> defaultPermsOfficer = MUtil.list(MPerm.ID_BUILD, MPerm.ID_DOOR, MPerm.ID_BUTTON, MPerm.ID_LEVER, MPerm.ID_LEVER, MPerm.ID_CONTAINER, MPerm.ID_DESC, MPerm.ID_MOTD, MPerm.ID_INVITE, MPerm.ID_KICK, MPerm.ID_RANK, MPerm.ID_TITLE, MPerm.ID_HOME, MPerm.ID_SETHOME, MPerm.ID_TERRITORY, MPerm.ID_ACCESS, MPerm.ID_CLAIMNEAR, MPerm.ID_REL);
public List<String> defaultPermsLeader = MUtil.list(MPerm.ID_BUILD, MPerm.ID_DOOR, MPerm.ID_BUTTON, MPerm.ID_LEVER, MPerm.ID_LEVER, MPerm.ID_CONTAINER, MPerm.ID_NAME, MPerm.ID_DESC, MPerm.ID_MOTD, MPerm.ID_INVITE, MPerm.ID_KICK, MPerm.ID_RANK, MPerm.ID_TITLE, MPerm.ID_HOME, MPerm.ID_SETHOME, MPerm.ID_WITHDRAW, MPerm.ID_TERRITORY, MPerm.ID_ACCESS, MPerm.ID_CLAIMNEAR, MPerm.ID_REL, MPerm.ID_DISBAND, MPerm.ID_FLAGS, MPerm.ID_FLAGS);*/
// -------------------------------------------- //
// TERRITORY INFO
// -------------------------------------------- //
@@ -473,17 +454,7 @@ public class MConf extends Entity<MConf>
// This one is for example applied to WarZone since that faction has the friendly fire flag set to true.
public ChatColor colorFriendlyFire = ChatColor.DARK_RED;
// -------------------------------------------- //
// PREFIXES
// -------------------------------------------- //
// Here you may edit the name prefixes associated with different faction ranks.
public String prefixLeader = "**";
public String prefixOfficer = "*";
public String prefixMember = "+";
public String prefixRecruit = "-";
// -------------------------------------------- //
// EXPLOITS
// -------------------------------------------- //
@@ -492,26 +463,6 @@ public class MConf extends Entity<MConf>
public boolean handleExploitEnderPearlClipping = true;
public boolean handleNetherPortalTrap = true;
// -------------------------------------------- //
// SEE CHUNK
// -------------------------------------------- //
// These options can be used to tweak the "/f seechunk" particle effect.
// They are fine as is but feel free to experiment with them if you want to.
// Use 1 or multiple of 3, 4 or 5.
public int seeChunkSteps = 1;
// White/Black List for creating sparse patterns.
public int seeChunkKeepEvery = 5;
public int seeChunkSkipEvery = 0;
@EditorType(TypeMillisDiff.class)
public long seeChunkPeriodMillis = 500;
public int seeChunkParticleAmount = 30;
public float seeChunkParticleOffsetY = 2;
public float seeChunkParticleDeltaY = 2;
// -------------------------------------------- //
// UNSTUCK
// -------------------------------------------- //