AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-27 01:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Even more 1.13 things

Browse Source
This commit is contained in:
ZeroEpoch1969 2018-07-25 22:22:19 -07:00
parent 3c46df0082
commit 551a0b2317
No known key found for this signature in database
GPG Key ID: A7BAB4E14F089CF3
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TotalFreedomMod.iml
View File

@ -13,7 +13,7 @@
<orderEntry type="library" name="aero-2.1-SNAPSHOT" level="project" /> <orderEntry type="library" name="aero-2.1-SNAPSHOT" level="project" />
<orderEntry type="library" name="JDA-3.6.0_354-withDependencies" level="project" /> <orderEntry type="library" name="JDA-3.6.0_354-withDependencies" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.0" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.13-pre7-R0.1-SNAPSHOT" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.13-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.github.Pravian:Aero:5f82926" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.Pravian:Aero:5f82926" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.12-R0.1-SNAPSHOT" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.12-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
@ -45,7 +45,7 @@
<orderEntry type="library" scope="PROVIDED" name="Maven: org.avaje:ebean:2.8.1" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.avaje:ebean:2.8.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.persistence:persistence-api:1.0" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: javax.persistence:persistence-api:1.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:Essentials:2.13.1" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:Essentials:2.13.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:craftbukkit:1.13-pre7-R0.1-SNAPSHOT" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:craftbukkit:1.13-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.dv8tion:JDA:3.7.1_385" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: net.dv8tion:JDA:3.7.1_385" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />

4
src/main/java/me/totalfreedom/totalfreedommod/GameRuleHandler.java
View File

@ -36,6 +36,7 @@ public class GameRuleHandler extends FreedomService
setGameRule(GameRule.COMMAND_BLOCK_OUTPUT, false); setGameRule(GameRule.COMMAND_BLOCK_OUTPUT, false);
setGameRule(GameRule.NATURAL_REGENERATION, true, false); setGameRule(GameRule.NATURAL_REGENERATION, true, false);
setGameRule(GameRule.KEEP_INVENTORY, true, false); setGameRule(GameRule.KEEP_INVENTORY, true, false);
setGameRule(GameRule.ANNOUNCE_ADVANCEMENTS, false, false);
commitGameRules(); commitGameRules();
} }
@ -94,7 +95,8 @@ public class GameRuleHandler extends FreedomService
DO_TILE_DROPS("doTileDrops", true), DO_TILE_DROPS("doTileDrops", true),
COMMAND_BLOCK_OUTPUT("commandBlockOutput", true), COMMAND_BLOCK_OUTPUT("commandBlockOutput", true),
NATURAL_REGENERATION("naturalRegeneration", true), NATURAL_REGENERATION("naturalRegeneration", true),
DO_DAYLIGHT_CYCLE("doDaylightCycle", true); DO_DAYLIGHT_CYCLE("doDaylightCycle", true),
ANNOUNCE_ADVANCEMENTS("announceAdvancements", false);
// //
private final String gameRuleName; private final String gameRuleName;
private final boolean defaultValue; private final boolean defaultValue;

7
src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java
View File

@ -142,10 +142,15 @@ public class Command_myadmin extends FreedomCommand
} }
String msg = StringUtils.join(args, " ", 1, args.length); String msg = StringUtils.join(args, " ", 1, args.length);
if (!msg.contains("%name%"))
{
msg("You login message must contain your name. To add it, specify %name% where you want it.", ChatColor.RED);
return true;
}
FUtil.adminAction(sender.getName(), "Setting personal login message" + (init == null ? "" : " for " + targetPlayer.getName()), false); FUtil.adminAction(sender.getName(), "Setting personal login message" + (init == null ? "" : " for " + targetPlayer.getName()), false);
target.setLoginMessage(msg); target.setLoginMessage(msg);
msg((init == null ? "Your" : targetPlayer.getName() + "'s") + " login message is now: "); msg((init == null ? "Your" : targetPlayer.getName() + "'s") + " login message is now: ");
msg("> " + ChatColor.AQUA + targetPlayer.getName() + " is " + ChatUtils.colorize(target.getLoginMessage())); msg("> " + FUtil.colorize(msg).replace("%name%", targetPlayer.getName()));
plugin.al.save(); plugin.al.save();
plugin.al.updateTables(); plugin.al.updateTables();
return true; return true;

12
src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java
View File

@ -175,7 +175,15 @@ public class RankManager extends FreedomService
FUtil.bcastMsg(ChatColor.AQUA + player.getName() + " is " + Rank.IMPOSTOR.getColoredLoginMessage()); FUtil.bcastMsg(ChatColor.AQUA + player.getName() + " is " + Rank.IMPOSTOR.getColoredLoginMessage());
if (plugin.al.isAdminImpostor(player)) if (plugin.al.isAdminImpostor(player))
{ {
FUtil.bcastMsg("Warning: " + player.getName() + " has been flagged as an impostor and has been frozen!", ChatColor.RED); FUtil.bcastMsg("Warning: " + player.getName() + " has been flagged as an admin impostor and has been frozen!", ChatColor.RED);
}
else if (plugin.mbl.isMasterBuilderImpostor(player))
{
FUtil.bcastMsg("Warning: " + player.getName() + " has been flagged as a Master Builder impostor and has been frozen!", ChatColor.RED);
}
else if (plugin.pv.isPlayerImpostor(player))
{
FUtil.bcastMsg("Warning: " + player.getName() + " has been flagged as a player impostor and has been frozen!", ChatColor.RED);
} }
String displayName = Rank.IMPOSTOR.getColor() + player.getName(); String displayName = Rank.IMPOSTOR.getColor() + player.getName();
player.setPlayerListName(StringUtils.substring(displayName, 0, 16)); player.setPlayerListName(StringUtils.substring(displayName, 0, 16));
@ -202,7 +210,7 @@ public class RankManager extends FreedomService
} }
} }
FUtil.bcastMsg(ChatColor.AQUA + player.getName() + " is " + loginMsg); FUtil.bcastMsg(loginMsg.replace("%name%", player.getName()));
plugin.pl.getPlayer(player).setTag(display.getColoredTag()); plugin.pl.getPlayer(player).setTag(display.getColoredTag());
if (isAdmin) if (isAdmin)