Skip to content
This repository has been archived by the owner on Jun 16, 2022. It is now read-only.

Commit

Permalink
SQL DB is a WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
@script-head
script-head committed May 29, 2020
1 parent 43ee178 commit 4ddcc3b
Show file tree
Hide file tree
Showing 54 changed files with 962 additions and 605 deletions.
3 changes: 2 additions & 1 deletion src/main/java/me/totalfreedom/totalfreedommod/EntityWiper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ public EntityWiper(TotalFreedomMod plugin)
EntityType.PAINTING,
EntityType.BOAT,
EntityType.LEASH_HITCH,
EntityType.ITEM_FRAME
EntityType.ITEM_FRAME,
EntityType.MINECART
);

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/totalfreedom/totalfreedommod/Fuckoff.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public void onPlayerMove(PlayerMoveEvent event)

if (distanceSquared < (fuckoffRange * fuckoffRange))
{
event.setTo(foLocation.clone().add(opLocation.subtract(foLocation).toVector().normalize().multiply(fuckoffRange * 1.1)));
onlinePlayer.setVelocity(onlinePlayer.getLocation().toVector().subtract(foLocation.toVector()).normalize().multiply(fPlayer.getFuckoffRadius()));
break;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ public void onPlayerJoin(PlayerJoinEvent event)
player.sendTitle(FUtil.colorize(ConfigEntry.SERVER_LOGIN_TITLE.getString()), FUtil.colorize(ConfigEntry.SERVER_LOGIN_SUBTITLE.getString()), 20, 100, 60);
player.setOp(true);

if (TELEPORT_ON_JOIN.contains(player.getName()))
if (TELEPORT_ON_JOIN.contains(player.getName()) || ConfigEntry.AUTO_TP.getBoolean())
{
int x = FUtil.randomInteger(-10000, 10000);
int z = FUtil.randomInteger(-10000, 10000);
Expand All @@ -210,7 +210,7 @@ public void onPlayerJoin(PlayerJoinEvent event)
return;
}

if (CLEAR_ON_JOIN.contains(player.getName()))
if (CLEAR_ON_JOIN.contains(player.getName()) || ConfigEntry.AUTO_CLEAR.getBoolean())
{
player.getInventory().clear();
player.sendMessage(ChatColor.AQUA + "Your inventory has been cleared automatically.");
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/me/totalfreedom/totalfreedommod/Muter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ public void onAsyncPlayerChatEvent(AsyncPlayerChatEvent event)

FPlayer fPlayer = plugin.pl.getPlayerSync(player);

FLog.info("checking mute");

if (!fPlayer.isMuted())
{
return;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import me.totalfreedom.totalfreedommod.admin.AdminList;
import me.totalfreedom.totalfreedommod.banning.BanManager;
import me.totalfreedom.totalfreedommod.banning.PermbanList;
import me.totalfreedom.totalfreedommod.banning.VPNBanList;
import me.totalfreedom.totalfreedommod.blocking.BlockBlocker;
import me.totalfreedom.totalfreedommod.blocking.EditBlocker;
import me.totalfreedom.totalfreedommod.blocking.EventBlocker;
Expand Down Expand Up @@ -47,6 +46,7 @@
import me.totalfreedom.totalfreedommod.punishments.PunishmentList;
import me.totalfreedom.totalfreedommod.rank.RankManager;
import me.totalfreedom.totalfreedommod.shop.Shop;
import me.totalfreedom.totalfreedommod.sql.SQLite;
import me.totalfreedom.totalfreedommod.util.FLog;
import me.totalfreedom.totalfreedommod.util.FUtil;
import me.totalfreedom.totalfreedommod.util.MethodTimer;
Expand Down Expand Up @@ -95,14 +95,14 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
public AntiSpam as;
public PlayerList pl;
public Shop sh;
public SQLite sql;
public Announcer an;
public ChatManager cm;
public Discord dc;
public PunishmentList pul;
public BanManager bm;
public PermbanList pm;
public PermissionManager pem;
public VPNBanList vn;
public ProtectArea pa;
public GameRuleHandler gr;
public CommandSpy cs;
Expand Down Expand Up @@ -177,9 +177,9 @@ public void enable()
backups.createBackups(AdminList.CONFIG_FILENAME);
backups.createBackups(PermbanList.CONFIG_FILENAME);
backups.createBackups(PermissionConfig.PERMISSIONS_FILENAME, true);
backups.createBackups(VPNBanList.CONFIG_FILENAME);
backups.createBackups(MasterBuilder.CONFIG_FILENAME);
backups.createBackups(PunishmentList.CONFIG_FILENAME);
backups.createBackups("");

This comment has been minimized.

Sign in to view

Copy link
@script-head

script-head May 29, 2020

Author

this should of said database.db, fixed it bc im stupid

config = new MainConfig(this);
config.load();
Expand All @@ -193,6 +193,7 @@ public void enable()
sf = services.registerService(SavedFlags.class);
wm = services.registerService(WorldManager.class);
lv = services.registerService(LogViewer.class);
sql = services.registerService(SQLite.class);
al = services.registerService(AdminList.class);
acl = services.registerService(ActivityLog.class);
rm = services.registerService(RankManager.class);
Expand All @@ -217,7 +218,6 @@ public void enable()
bm = services.registerService(BanManager.class);
pm = services.registerService(PermbanList.class);
pem = services.registerService(PermissionManager.class);
vn = services.registerService(VPNBanList.class);
pa = services.registerService(ProtectArea.class);
gr = services.registerService(GameRuleHandler.class);
snp = services.registerService(SignBlocker.class);
Expand Down
100 changes: 44 additions & 56 deletions src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,26 @@
package me.totalfreedom.totalfreedommod.admin;

import com.google.common.collect.Lists;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import lombok.Getter;
import lombok.Setter;
import me.totalfreedom.totalfreedommod.LogViewer.LogsRegistrationMode;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil;
import net.pravian.aero.base.ConfigLoadable;
import net.pravian.aero.base.ConfigSavable;
import net.pravian.aero.base.Validatable;
import net.pravian.aero.util.Ips;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.Validate;
import org.bukkit.ChatColor;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.entity.Player;

public class Admin implements ConfigLoadable, ConfigSavable, Validatable
public class Admin
{

@Getter
private String configKey;
@Getter
@Setter
private String name;
Expand Down Expand Up @@ -68,14 +64,28 @@ public class Admin implements ConfigLoadable, ConfigSavable, Validatable

public Admin(Player player)
{
this.configKey = player.getName().toLowerCase();
this.name = player.getName();
this.ips.add(Ips.getIp(player));
}

public Admin(String configKey)
public Admin(String username, List<String> ips, Rank rank, Boolean active, Date lastLogin, String loginMessage, String tag, String discordID, List<String> backupCodes, Boolean commandSpy, Boolean potionSpy, String acFormat, Boolean oldTags, Boolean logStick)
{
this.configKey = configKey;
this.name = username;
this.active = active;
this.rank = rank;
this.ips.clear();
this.ips.addAll(ips);
this.lastLogin = lastLogin;
this.loginMessage = loginMessage;
this.tag = tag;
this.discordID = discordID;
this.backupCodes.clear();
this.backupCodes.addAll(backupCodes);
this.commandSpy = commandSpy;
this.potionSpy = potionSpy;
this.acFormat = acFormat;
this.oldTags = oldTags;
this.logStick = logStick;
}

@Override
Expand All @@ -94,59 +104,39 @@ public String toString()
.append("- Potion Spy: ").append(potionSpy).append("\n")
.append("- Admin Chat Format: ").append(acFormat).append("\n")
.append("- Old Tags: ").append(oldTags).append("\n")
.append("- Log Stick: ").append(logStick)
.append("- Backup Codes: ").append(backupCodes.size()).append("/10").append("\n");
.append("- Log Stick: ").append(logStick).append("\n")
.append("- Backup Codes: ").append(backupCodes.size()).append("/10");

return output.toString();
}

public void loadFrom(Player player)
{
configKey = player.getName().toLowerCase();
name = player.getName();
ips.clear();
ips.add(Ips.getIp(player));
}

@Override
public void loadFrom(ConfigurationSection cs)
{
name = cs.getString("username", configKey);
active = cs.getBoolean("active", true);
rank = Rank.findRank(cs.getString("rank"));
ips.clear();
ips.addAll(cs.getStringList("ips"));
backupCodes.clear();
backupCodes.addAll(cs.getStringList("backupCodes"));
lastLogin = FUtil.stringToDate(cs.getString("last_login"));
loginMessage = cs.getString("login_message", null);
discordID = cs.getString("discord_id", null);
tag = cs.getString("tag", null);
commandSpy = cs.getBoolean("command_spy", false);
potionSpy = cs.getBoolean("potion_spy", false);
acFormat = cs.getString("acformat", null);
oldTags = cs.getBoolean("oldtags", false);
logStick = cs.getBoolean("logstick", false);
}

@Override
public void saveTo(ConfigurationSection cs)
{
Validate.isTrue(isValid(), "Could not save admin entry: " + name + ". Entry not valid!");
cs.set("username", name);
cs.set("active", active);
cs.set("rank", rank.toString());
cs.set("ips", Lists.newArrayList(ips));
cs.set("backupCodes", Lists.newArrayList(backupCodes));
cs.set("last_login", FUtil.dateToString(lastLogin));
cs.set("login_message", loginMessage);
cs.set("discord_id", discordID);
cs.set("tag", tag);
cs.set("command_spy", commandSpy);
cs.set("potion_spy", potionSpy);
cs.set("acformat", acFormat);
cs.set("oldtags", oldTags);
cs.set("logstick", logStick);
public Map<String, Object> toSQLStorable()
{
Map<String, Object> map = new HashMap<String, Object>()
{{
put("username", name);
put("active", active);
put("rank", rank.toString());
put("ips", FUtil.listToString(ips));
put("backup_codes", FUtil.listToString(backupCodes));
put("last_login", lastLogin.getTime());
put("login_message", loginMessage);
put("discord_id", discordID);
put("tag", tag);
put("command_spy", commandSpy);
put("potion_spy", potionSpy);
put("ac_format", acFormat);
put("old_tags", oldTags);
put("log_stick", logStick);
}};
return map;
}

public boolean isAtLeast(Rank pRank)
Expand Down Expand Up @@ -225,11 +215,9 @@ public void setActive(boolean active)
}
}

@Override
public boolean isValid()
{
return configKey != null
&& name != null
return name != null
&& rank != null
&& !ips.isEmpty()
&& lastLogin != null;
Expand Down
Loading

0 comments on commit 4ddcc3b

Please sign in to comment.