-
Notifications
You must be signed in to change notification settings - Fork 221
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Version 5.0 This TotalFreedomMod release implements many changes. Most notably, the internals have been completely revamped. TotalFreedomMod now relies on the Aero library for core mechanics such as command handling and services. Another important change is the UUID system. In TotalFreedomMod Electrum, it has been completely removed. The core reason for this is that the system as a whole was very bugged. Additionally, it did not solve the primary reason for its conception: preserving player data when the player changes their username. This is because TotalFreedomMod servers usually run in offline-mode. This meaning that some of the players joining do not have a registerd Mojang UUID whatsoever. All in all, the UUID system was buggy, and it did not fix the reason it was implemented, so it has been completely removed. The admin list and the ban list now use usernames and IPs again. Lastly, many smaller changes have been implemented. Due to the amount of changes, they have not been named individualy. Please refer to the issues below for more details. Fixes #342 Fixes #350 Fixes #380 Fixes #684 Fixes #704 Fixes #716 Fixes #735 Fixes #745 Fixes #784 Fixes #765 Fixes #791 Fixes #805 Fixes #826 Fixes #883 Fixes #1524 Fixes #1534 Fixes #1536 Fixes #1538 Fixes #1545 Fixes #1546 Fixes #1568 Fixes #1627 Resolves #403 Resolves #435 Resolves #597 Resolves #603 Resolves #628 Resolves #690 Resolves #708 Resolves #747 Resolves #748 Resolves #749 Resolves #764 Resolves #767 Resolves #782 Resolves #809 Resolves #803 Resolves #811 Resolves #813 Resolves #830 Resolves #848 Resolves #856 Resolves #876 Resolves #908 Resolves #992 Resolves #1018 Resolves #1432 Resolves #1446 Resolves #1494 Resolves #1501 Resolves #1526 Resolves #1540 Resolves #1550 Resolves #1560 Resolves #1561 Resolves #1578 Resolves #1613
- Loading branch information
Showing
109 changed files
with
2,097 additions
and
2,021 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
116 changes: 116 additions & 0 deletions
116
src/main/java/me/totalfreedom/totalfreedommod/AutoEject.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| package me.totalfreedom.totalfreedommod; | ||
|
|
||
| import java.util.Calendar; | ||
| import java.util.Date; | ||
| import java.util.GregorianCalendar; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import me.totalfreedom.totalfreedommod.banning.Ban; | ||
| import me.totalfreedom.totalfreedommod.util.FLog; | ||
| import me.totalfreedom.totalfreedommod.util.FUtil; | ||
| import net.pravian.aero.util.Ips; | ||
| import org.bukkit.Bukkit; | ||
| import org.bukkit.ChatColor; | ||
| import org.bukkit.GameMode; | ||
| import org.bukkit.entity.Player; | ||
|
|
||
| public class AutoEject extends FreedomService | ||
| { | ||
|
|
||
| private final Map<String, Integer> ejects = new HashMap<>(); // ip -> amount | ||
|
|
||
| public AutoEject(TotalFreedomMod plugin) | ||
| { | ||
| super(plugin); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onStart() | ||
| { | ||
| } | ||
|
|
||
| @Override | ||
| protected void onStop() | ||
| { | ||
| } | ||
|
|
||
| public void autoEject(Player player, String kickMessage) | ||
| { | ||
| EjectMethod method = EjectMethod.STRIKE_ONE; | ||
| final String ip = Ips.getIp(player); | ||
|
|
||
| if (!ejects.containsKey(ip)) | ||
| { | ||
| ejects.put(ip, 0); | ||
| } | ||
|
|
||
| int kicks = ejects.get(ip); | ||
| kicks += 1; | ||
|
|
||
| ejects.put(ip, kicks); | ||
|
|
||
| if (kicks <= 1) | ||
| { | ||
| method = EjectMethod.STRIKE_ONE; | ||
| } | ||
| else if (kicks == 2) | ||
| { | ||
| method = EjectMethod.STRIKE_TWO; | ||
| } | ||
| else if (kicks >= 3) | ||
| { | ||
| method = EjectMethod.STRIKE_THREE; | ||
| } | ||
|
|
||
| FLog.info("AutoEject -> name: " + player.getName() + " - player ip: " + ip + " - method: " + method.toString()); | ||
|
|
||
| player.setOp(false); | ||
| player.setGameMode(GameMode.SURVIVAL); | ||
| player.getInventory().clear(); | ||
|
|
||
| switch (method) | ||
| { | ||
| case STRIKE_ONE: | ||
| { | ||
| final Calendar cal = new GregorianCalendar(); | ||
| cal.add(Calendar.MINUTE, 5); | ||
| final Date expires = cal.getTime(); | ||
|
|
||
| FUtil.bcastMsg(ChatColor.RED + player.getName() + " has been banned for 5 minutes."); | ||
|
|
||
| plugin.bm.addBan(Ban.forPlayer(player, Bukkit.getConsoleSender(), expires, kickMessage)); | ||
| player.kickPlayer(kickMessage); | ||
|
|
||
| break; | ||
| } | ||
| case STRIKE_TWO: | ||
| { | ||
| final Calendar c = new GregorianCalendar(); | ||
| c.add(Calendar.MINUTE, 10); | ||
| final Date expires = c.getTime(); | ||
|
|
||
| FUtil.bcastMsg(ChatColor.RED + player.getName() + " has been banned for 10 minutes."); | ||
|
|
||
| plugin.bm.addBan(Ban.forPlayer(player, Bukkit.getConsoleSender(), expires, kickMessage)); | ||
| player.kickPlayer(kickMessage); | ||
| break; | ||
| } | ||
| case STRIKE_THREE: | ||
| { | ||
| plugin.bm.addBan(Ban.forPlayerFuzzy(player, Bukkit.getConsoleSender(), null, kickMessage)); | ||
|
|
||
| FUtil.bcastMsg(ChatColor.RED + player.getName() + " has been banned."); | ||
|
|
||
| player.kickPlayer(kickMessage); | ||
| break; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public static enum EjectMethod | ||
| { | ||
|
|
||
| STRIKE_ONE, STRIKE_TWO, STRIKE_THREE; | ||
| } | ||
|
|
||
| } |
87 changes: 87 additions & 0 deletions
87
src/main/java/me/totalfreedom/totalfreedommod/BackupManager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| package me.totalfreedom.totalfreedommod; | ||
|
|
||
| import java.io.File; | ||
| import me.totalfreedom.totalfreedommod.util.FLog; | ||
| import me.totalfreedom.totalfreedommod.util.FUtil; | ||
| import net.pravian.aero.component.PluginComponent; | ||
| import net.pravian.aero.config.YamlConfig; | ||
| import org.bukkit.util.FileUtil; | ||
|
|
||
| public class BackupManager extends PluginComponent<TotalFreedomMod> | ||
| { | ||
|
|
||
| public BackupManager(TotalFreedomMod plugin) | ||
| { | ||
| super(plugin); | ||
| } | ||
|
|
||
| public void createBackups(String file) | ||
| { | ||
| createBackups(file, false); | ||
| } | ||
|
|
||
| public void createBackups(String file, boolean onlyWeekly) | ||
| { | ||
| final String save = file.split("\\.")[0]; | ||
| final YamlConfig config = new YamlConfig(plugin, "backup/backup.yml", false); | ||
| config.load(); | ||
|
|
||
| // Weekly | ||
| if (!config.isInt(save + ".weekly")) | ||
| { | ||
| performBackup(file, "weekly"); | ||
| config.set(save + ".weekly", FUtil.getUnixTime()); | ||
| } | ||
| else | ||
| { | ||
| int lastBackupWeekly = config.getInt(save + ".weekly"); | ||
|
|
||
| if (lastBackupWeekly + 3600 * 24 * 7 < FUtil.getUnixTime()) | ||
| { | ||
| performBackup(file, "weekly"); | ||
| config.set(save + ".weekly", FUtil.getUnixTime()); | ||
| } | ||
| } | ||
|
|
||
| if (onlyWeekly) | ||
| { | ||
| config.save(); | ||
| return; | ||
| } | ||
|
|
||
| // Daily | ||
| if (!config.isInt(save + ".daily")) | ||
| { | ||
| performBackup(file, "daily"); | ||
| config.set(save + ".daily", FUtil.getUnixTime()); | ||
| } | ||
| else | ||
| { | ||
| int lastBackupDaily = config.getInt(save + ".daily"); | ||
|
|
||
| if (lastBackupDaily + 3600 * 24 < FUtil.getUnixTime()) | ||
| { | ||
| performBackup(file, "daily"); | ||
| config.set(save + ".daily", FUtil.getUnixTime()); | ||
| } | ||
| } | ||
|
|
||
| config.save(); | ||
| } | ||
|
|
||
| private void performBackup(String file, String type) | ||
| { | ||
| FLog.info("Backing up " + file + " to " + file + "." + type + ".bak"); | ||
| final File backupFolder = new File(plugin.getDataFolder(), "backup"); | ||
|
|
||
| if (!backupFolder.exists()) | ||
| { | ||
| backupFolder.mkdirs(); | ||
| } | ||
|
|
||
| final File oldYaml = new File(plugin.getDataFolder(), file); | ||
| final File newYaml = new File(backupFolder, file + "." + type + ".bak"); | ||
| FileUtil.copy(oldYaml, newYaml); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.