33 src/com/turt2live/antishare/money/MoneyManager.java
View file
@@ -17,9 +17,6 @@
import com.turt2live.antishare.AntiShare;
import com.turt2live.antishare.AntiShare.LogType;
import com.turt2live.antishare.api.ASGameMode;
import com.turt2live.antishare.metrics.TenderAmountTracker;
import com.turt2live.antishare.metrics.TenderTracker;
import com.turt2live.antishare.metrics.TrackerList.TrackerType;
import com.turt2live.antishare.money.Tender.TenderType;
import com.turt2live.antishare.notification.Alert.AlertTrigger;
import com.turt2live.antishare.notification.Alert.AlertType;
@@ -125,36 +122,6 @@ public void reload(){
if(doReward){
rewardsLoaded++;
}

// Configure trackers
// Reward tracker
if(plugin.getTrackers().getTracker(TrackerType.REWARD, type.getName()) == null){
TenderTracker tracker = new TenderTracker(type.getName(), TrackerType.REWARD, a);
plugin.getTrackers().add(tracker);
}else{
((TenderTracker) plugin.getTrackers().getTracker(TrackerType.REWARD, type.getName())).updateTender(a);
}
// Reward Amount tracker
if(plugin.getTrackers().getTracker(TrackerType.REWARD_AMOUNT, type.getName()) == null){
TenderAmountTracker tracker = new TenderAmountTracker(type.getName(), TrackerType.REWARD_AMOUNT, a);
plugin.getTrackers().add(tracker);
}else{
((TenderAmountTracker) plugin.getTrackers().getTracker(TrackerType.REWARD_AMOUNT, type.getName())).updateTender(a);
}
// Fine tracker
if(plugin.getTrackers().getTracker(TrackerType.FINE, type.getName()) == null){
TenderTracker tracker = new TenderTracker(type.getName(), TrackerType.FINE, f);
plugin.getTrackers().add(tracker);
}else{
((TenderTracker) plugin.getTrackers().getTracker(TrackerType.FINE, type.getName())).updateTender(f);
}
// Fine Amount tracker
if(plugin.getTrackers().getTracker(TrackerType.FINE_AMOUNT, type.getName()) == null){
TenderAmountTracker tracker = new TenderAmountTracker(type.getName(), TrackerType.FINE_AMOUNT, f);
plugin.getTrackers().add(tracker);
}else{
((TenderAmountTracker) plugin.getTrackers().getTracker(TrackerType.FINE_AMOUNT, type.getName())).updateTender(f);
}
}

// Spam console
4 src/com/turt2live/antishare/money/Reward.java
View file
@@ -8,7 +8,6 @@
import com.turt2live.antishare.ASUtils;
import com.turt2live.antishare.AntiShare.LogType;
import com.turt2live.antishare.api.ASGameMode;
import com.turt2live.antishare.metrics.TrackerList.TrackerType;
import com.turt2live.antishare.permissions.PermissionNodes;

/**
@@ -50,9 +49,6 @@ public void apply(Player player){
ASUtils.sendToPlayer(player, "Your new balance is " + ChatColor.YELLOW + balance);
}
}

// Increment statistic
plugin.getTrackers().getTracker(TrackerType.REWARD_GIVEN).increment(1); // Does not have a name!
}

}
52 src/com/turt2live/antishare/notification/Alert.java
View file
@@ -12,7 +12,6 @@
import com.feildmaster.lib.configuration.EnhancedConfiguration;
import com.turt2live.antishare.ASUtils;
import com.turt2live.antishare.AntiShare;
import com.turt2live.antishare.metrics.TrackerList.TrackerType;
import com.turt2live.antishare.permissions.PermissionNodes;

/**
@@ -40,27 +39,25 @@ public class Alert {
* @author turt2live
*/
public static enum AlertTrigger{
BLOCK_BREAK("types.block-break", "BLOCK_BREAK"),
BLOCK_PLACE("types.block-place", "BLOCK_PLACE"),
PLAYER_DEATH("types.player-death", "DEATH"),
ITEM_DROP("types.item-drop", "DROP"),
ITEM_PICKUP("types.item-pickup", "PICKUP"),
RIGHT_CLICK("types.right-click", "RIGHT_CLICK"),
USE_ITEM("types.use-item", "USE"),
CREATIVE_BLOCK("types.creative-block-break", "CREATIVE_BLOCK"),
SURVIVAL_BLOCK("types.survival-block-break", "SURVIVAL_BLOCK"),
HIT_PLAYER("types.hit-player", "HIT_PLAYER"),
HIT_MOB("types.hit-mob", "HIT_MOB"),
COMMAND("types.command", "COMMAND"),
GENERAL("send-general-notifications", null),
CLOSE_TO_WORLD_SPLIT(null, null);
BLOCK_BREAK("types.block-break"),
BLOCK_PLACE("types.block-place"),
PLAYER_DEATH("types.player-death"),
ITEM_DROP("types.item-drop"),
ITEM_PICKUP("types.item-pickup"),
RIGHT_CLICK("types.right-click"),
USE_ITEM("types.use-item"),
CREATIVE_BLOCK("types.creative-block-break"),
SURVIVAL_BLOCK("types.survival-block-break"),
HIT_PLAYER("types.hit-player"),
HIT_MOB("types.hit-mob"),
COMMAND("types.command"),
GENERAL("send-general-notifications"),
CLOSE_TO_WORLD_SPLIT(null);

private String node;
private String tracker;

private AlertTrigger(String node, String tracker){
private AlertTrigger(String node){
this.node = node;
this.tracker = tracker;
}

/**
@@ -80,19 +77,6 @@ public boolean show(){
notifications.load();
return notifications.getBoolean(node);
}

/**
* Gets the tracker for this alert
*
* @param type the alert type
* @return the tracker
*/
public TrackerType tracker(AlertType type){
if(tracker == null){
return null;
}
return TrackerType.valueOf(tracker + "_" + type.name());
}
}

/**
@@ -250,12 +234,6 @@ public void alert(String message, CommandSender sender, String playerMessage, Al
ASUtils.sendToPlayer(Bukkit.getConsoleSender(), "[" + type.name() + "] " + message);
}

// Send to tracker
if(trigger.tracker(type) != null){
TrackerType tt = trigger.tracker(type);
AntiShare.getInstance().getTrackers().getTracker(tt).increment(1);
}

// Send fine/reward
if(sender instanceof Player && reward){
Player player = (Player) sender;