EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 07:06:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix bug with HolidayManager and some cleanup

Browse Source
This commit is contained in:
TfT_02 2013-10-18 16:24:01 +02:00
parent 3252137ed7
commit 4a428a47af
1 changed files with 22 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/main/java/com/gmail/nossr50/util/HolidayManager.java
View File

@ -13,7 +13,6 @@ import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import java.util.List; import java.util.List;
import java.util.Random;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Color; import org.bukkit.Color;
@ -28,14 +27,14 @@ import org.bukkit.inventory.meta.FireworkMeta;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
public final class HolidayManager { public final class HolidayManager {
static String anniversaryFilePath = mcMMO.getFlatFileDirectory() + "anniversary";
private static ArrayList<String> hasCelebrated; private static ArrayList<String> hasCelebrated;
private static final Random rand = new Random();
private HolidayManager() {} private HolidayManager() {}
// This gets called onEnable // This gets called onEnable
public static void createAnniversaryFile() { public static void createAnniversaryFile() {
File anniversaryFile = new File(mcMMO.p.getDataFolder().getAbsolutePath() + File.separator + "anniversary"); File anniversaryFile = new File(anniversaryFilePath);
if (!anniversaryFile.exists()) { if (!anniversaryFile.exists()) {
try { try {
@ -50,7 +49,7 @@ public final class HolidayManager {
try { try {
hasCelebrated.clear(); hasCelebrated.clear();
BufferedReader reader = new BufferedReader(new FileReader(mcMMO.p.getDataFolder().getAbsolutePath() + File.separator + "anniversary")); BufferedReader reader = new BufferedReader(new FileReader(anniversaryFilePath));
String line = reader.readLine(); String line = reader.readLine();
while (line != null) { while (line != null) {
@ -68,7 +67,7 @@ public final class HolidayManager {
// This gets called onDisable // This gets called onDisable
public static void saveAnniversaryFiles() { public static void saveAnniversaryFiles() {
try { try {
BufferedWriter writer = new BufferedWriter(new FileWriter(mcMMO.p.getDataFolder().getAbsolutePath() + File.separator + "anniversary")); BufferedWriter writer = new BufferedWriter(new FileWriter(anniversaryFilePath));
for (String player : hasCelebrated) { for (String player : hasCelebrated) {
writer.write(player); writer.write(player);
writer.newLine(); writer.newLine();
@ -103,7 +102,7 @@ public final class HolidayManager {
if (sender instanceof Player) { if (sender instanceof Player) {
final int firework_amount = 10; final int firework_amount = 10;
for (int i = 0; i < firework_amount; i++) { for (int i = 0; i < firework_amount; i++) {
int delay = (int) (rand.nextDouble() * 3 * 20) + 4; int delay = (int) (Misc.getRandom().nextDouble() * 3 * 20) + 4;
mcMMO.p.getServer().getScheduler().runTaskLater(mcMMO.p, new Runnable() { mcMMO.p.getServer().getScheduler().runTaskLater(mcMMO.p, new Runnable() {
@Override @Override
public void run() { public void run() {
@ -170,56 +169,38 @@ public final class HolidayManager {
} }
private static void spawnFireworks(Player player) { private static void spawnFireworks(Player player) {
int power = (int) (rand.nextDouble() * 3) + 1; int power = (int) (Misc.getRandom().nextDouble() * 3) + 1;
int type = (int) (rand.nextDouble() * 5) + 1; Type fireworkType = Type.values()[Misc.getRandom().nextInt(Type.values().length)];
double varX = rand.nextGaussian() * 3; double varX = Misc.getRandom().nextGaussian() * 3;
double varZ = rand.nextGaussian() * 3; double varZ = Misc.getRandom().nextGaussian() * 3;
Type typen;
switch (type) {
case 2:
typen = Type.BALL_LARGE;
break;
case 3:
typen = Type.BURST;
break;
case 4:
typen = Type.CREEPER;
break;
case 5:
typen = Type.STAR;
break;
default:
typen = Type.BALL;
}
Firework fireworks = (Firework) player.getWorld().spawnEntity(player.getLocation().add(varX, 0, varZ), EntityType.FIREWORK); Firework fireworks = (Firework) player.getWorld().spawnEntity(player.getLocation().add(varX, 0, varZ), EntityType.FIREWORK);
FireworkMeta fireworkmeta = fireworks.getFireworkMeta(); FireworkMeta fireworkmeta = fireworks.getFireworkMeta();
FireworkEffect effect = FireworkEffect.builder().flicker(rand.nextBoolean()).withColor(colorChoose()).withFade(colorChoose()).with(typen).trail(rand.nextBoolean()).build(); FireworkEffect effect = FireworkEffect.builder().flicker(Misc.getRandom().nextBoolean()).withColor(colorChoose()).withFade(colorChoose()).with(fireworkType).trail(Misc.getRandom().nextBoolean()).build();
fireworkmeta.addEffect(effect); fireworkmeta.addEffect(effect);
fireworkmeta.setPower(power); fireworkmeta.setPower(power);
fireworks.setFireworkMeta(fireworkmeta); fireworks.setFireworkMeta(fireworkmeta);
} }
private static List<Color> colorChoose() { private static List<Color> colorChoose() {
// Thanks Zomis and Tejpbit for the help with this function! Collections.shuffle(ALL_COLORS, Misc.getRandom());
Collections.shuffle(ALL_COLORS, rand);
int numberOfColors = rand.nextInt(ALL_COLORS.size()); int numberOfColors = Misc.getRandom().nextInt(ALL_COLORS.size() + 1);
List<Color> choosenColors = ALL_COLORS.subList(0, numberOfColors);
return new ArrayList<Color>(choosenColors); // don't let caller modify ALL_COLORS if (numberOfColors == 0) {
numberOfColors = 1;
}
List<Color> chosenColors = ALL_COLORS.subList(0, numberOfColors);
return new ArrayList<Color>(chosenColors); // don't let caller modify ALL_COLORS
} }
private static String chatColorChoose() { private static String chatColorChoose() {
StringBuilder ret = new StringBuilder(ALL_CHAT_COLORS.get(rand.nextInt(ALL_CHAT_COLORS.size())).toString()); StringBuilder ret = new StringBuilder(ALL_CHAT_COLORS.get(Misc.getRandom().nextInt(ALL_CHAT_COLORS.size())).toString());
for (ChatColor CHAT_FORMAT : CHAT_FORMATS) { for (ChatColor CHAT_FORMAT : CHAT_FORMATS) {
if (rand.nextInt(4) == 0) { if (Misc.getRandom().nextInt(4) == 0) {
ret.append(CHAT_FORMAT); ret.append(CHAT_FORMAT);
} }
} }
@ -257,6 +238,6 @@ public final class HolidayManager {
ALL_CHAT_COLORS.add(c); ALL_CHAT_COLORS.add(c);
} }
} }
Collections.shuffle(ALL_CHAT_COLORS, rand); Collections.shuffle(ALL_CHAT_COLORS, Misc.getRandom());
} }
} }