SpigotMC
/
Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added F InventorySee

This commit is contained in:
Driftay 2019-06-29 10:20:59 -04:00
parent be9bdaa4fd
commit 4c3b8b0d18
14 changed files with 134 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -13,7 +13,7 @@
/target
# vim
.*.sw[a-savageFactions]
.*.sw[a-saberFactions]
# various other potential build files
/build

16
javadoc/com/massivecraft/factions/P.html
View File

@ -222,7 +222,7 @@ extends <a href="../../../com/massivecraft/factions/zcore/MPlugin.html" title="c
<tr class="altColor">
<td class="colFirst"><code>static <a href="../../../com/massivecraft/factions/P.html" title="class in com.massivecraft.factions">P</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../../com/massivecraft/factions/P.html#savageFactions">savageFactions</a></span></code>&nbsp;
href="../../../com/massivecraft/factions/P.html#saberFactions">saberFactions</a></span></code>&nbsp;
</td>
</tr>
<tr class="rowColor">
@ -456,13 +456,13 @@ extends <a href="../../../com/massivecraft/factions/zcore/MPlugin.html" title="c
<tr id="i30" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../../com/massivecraft/factions/P.html#playSound-org.bukkit.entity.Player-java.util.List-">playSound</a></span>(org.bukkit.entity.Player&nbsp;savageFactions,
href="../../../com/massivecraft/factions/P.html#playSound-org.bukkit.entity.Player-java.util.List-">playSound</a></span>(org.bukkit.entity.Player&nbsp;saberFactions,
java.util.List&lt;java.lang.String&gt;&nbsp;sounds)</code>&nbsp;</td>
</tr>
<tr id="i31" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../../com/massivecraft/factions/P.html#playSound-org.bukkit.entity.Player-java.lang.String-">playSound</a></span>(org.bukkit.entity.Player&nbsp;savageFactions,
href="../../../com/massivecraft/factions/P.html#playSound-org.bukkit.entity.Player-java.lang.String-">playSound</a></span>(org.bukkit.entity.Player&nbsp;saberFactions,
java.lang.String&nbsp;sound)</code>&nbsp;</td>
</tr>
<tr id="i32" class="altColor">
@ -538,14 +538,14 @@ extends <a href="../../../com/massivecraft/factions/zcore/MPlugin.html" title="c
<!-- -->
</a>
<h3>Field Detail</h3>
<a name="savageFactions">
<a name="saberFactions">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>savageFactions</h4>
<h4>saberFactions</h4>
<pre>public static&nbsp;<a href="../../../com/massivecraft/factions/P.html"
title="class in com.massivecraft.factions">P</a> savageFactions</pre>
title="class in com.massivecraft.factions">P</a> saberFactions</pre>
</li>
</ul>
<a name="perms">
@ -894,7 +894,7 @@ extends <a href="../../../com/massivecraft/factions/zcore/MPlugin.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>playSound</h4>
<pre>public&nbsp;void&nbsp;playSound(org.bukkit.entity.Player&nbsp;savageFactions,
<pre>public&nbsp;void&nbsp;playSound(org.bukkit.entity.Player&nbsp;saberFactions,
java.util.List&lt;java.lang.String&gt;&nbsp;sounds)</pre>
</li>
</ul>
@ -904,7 +904,7 @@ extends <a href="../../../com/massivecraft/factions/zcore/MPlugin.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>playSound</h4>
<pre>public&nbsp;void&nbsp;playSound(org.bukkit.entity.Player&nbsp;savageFactions,
<pre>public&nbsp;void&nbsp;playSound(org.bukkit.entity.Player&nbsp;saberFactions,
java.lang.String&nbsp;sound)</pre>
</li>
</ul>

12
javadoc/com/massivecraft/factions/listeners/FactionsBlockListener.html
View File

@ -143,7 +143,7 @@ implements org.bukkit.event.Listener</pre>
<td class="colFirst"><code><a href="../../../../com/massivecraft/factions/SavageFactions.html"
title="class in com.massivecraft.factions">SavageFactions</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../../../com/massivecraft/factions/listeners/FactionsBlockListener.html#savageFactions">savageFactions</a></span></code>&nbsp;
href="../../../../com/massivecraft/factions/listeners/FactionsBlockListener.html#saberFactions">saberFactions</a></span></code>&nbsp;
</td>
</tr>
</table>
@ -163,7 +163,7 @@ implements org.bukkit.event.Listener</pre>
<tr class="altColor">
<td class="colOne"><code><span class="memberNameLink"><a
href="../../../../com/massivecraft/factions/listeners/FactionsBlockListener.html#FactionsBlockListener-com.massivecraft.factions.SavageFactions-">FactionsBlockListener</a></span>(<a
href="../../../../com/massivecraft/factions/SavageFactions.html" title="class in com.massivecraft.factions">SavageFactions</a>&nbsp;savageFactions)</code>&nbsp;
href="../../../../com/massivecraft/factions/SavageFactions.html" title="class in com.massivecraft.factions">SavageFactions</a>&nbsp;saberFactions)</code>&nbsp;
</td>
</tr>
</table>
@ -265,14 +265,14 @@ implements org.bukkit.event.Listener</pre>
<pre>public static&nbsp;java.util.HashMap&lt;java.lang.String,org.bukkit.Location&gt; bannerLocations</pre>
</li>
</ul>
<a name="savageFactions">
<a name="saberFactions">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
<h4>savageFactions</h4>
<h4>saberFactions</h4>
<pre>public&nbsp;<a href="../../../../com/massivecraft/factions/SavageFactions.html"
title="class in com.massivecraft.factions">SavageFactions</a> savageFactions</pre>
title="class in com.massivecraft.factions">SavageFactions</a> saberFactions</pre>
</li>
</ul>
</li>
@ -290,7 +290,7 @@ implements org.bukkit.event.Listener</pre>
<li class="blockList">
<h4>FactionsBlockListener</h4>
<pre>public&nbsp;FactionsBlockListener(<a href="../../../../com/massivecraft/factions/SavageFactions.html"
title="class in com.massivecraft.factions">SavageFactions</a>&nbsp;savageFactions)</pre>
title="class in com.massivecraft.factions">SavageFactions</a>&nbsp;saberFactions)</pre>
</li>
</ul>
</li>

12
javadoc/com/massivecraft/factions/listeners/FactionsChatListener.html
View File

@ -137,7 +137,7 @@ implements org.bukkit.event.Listener</pre>
<td class="colFirst"><code><a href="../../../../com/massivecraft/factions/SavageFactions.html"
title="class in com.massivecraft.factions">SavageFactions</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../../../com/massivecraft/factions/listeners/FactionsChatListener.html#savageFactions">savageFactions</a></span></code>&nbsp;
href="../../../../com/massivecraft/factions/listeners/FactionsChatListener.html#saberFactions">saberFactions</a></span></code>&nbsp;
</td>
</tr>
</table>
@ -157,7 +157,7 @@ implements org.bukkit.event.Listener</pre>
<tr class="altColor">
<td class="colOne"><code><span class="memberNameLink"><a
href="../../../../com/massivecraft/factions/listeners/FactionsChatListener.html#FactionsChatListener-com.massivecraft.factions.SavageFactions-">FactionsChatListener</a></span>(<a
href="../../../../com/massivecraft/factions/SavageFactions.html" title="class in com.massivecraft.factions">SavageFactions</a>&nbsp;savageFactions)</code>&nbsp;
href="../../../../com/massivecraft/factions/SavageFactions.html" title="class in com.massivecraft.factions">SavageFactions</a>&nbsp;saberFactions)</code>&nbsp;
</td>
</tr>
</table>
@ -205,14 +205,14 @@ implements org.bukkit.event.Listener</pre>
<!-- -->
</a>
<h3>Field Detail</h3>
<a name="savageFactions">
<a name="saberFactions">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
<h4>savageFactions</h4>
<h4>saberFactions</h4>
<pre>public&nbsp;<a href="../../../../com/massivecraft/factions/SavageFactions.html"
title="class in com.massivecraft.factions">SavageFactions</a> savageFactions</pre>
title="class in com.massivecraft.factions">SavageFactions</a> saberFactions</pre>
</li>
</ul>
</li>
@ -230,7 +230,7 @@ implements org.bukkit.event.Listener</pre>
<li class="blockList">
<h4>FactionsChatListener</h4>
<pre>public&nbsp;FactionsChatListener(<a href="../../../../com/massivecraft/factions/SavageFactions.html"
title="class in com.massivecraft.factions">SavageFactions</a>&nbsp;savageFactions)</pre>
title="class in com.massivecraft.factions">SavageFactions</a>&nbsp;saberFactions)</pre>
</li>
</ul>
</li>

12
javadoc/com/massivecraft/factions/listeners/FactionsEntityListener.html
View File

@ -137,7 +137,7 @@ implements org.bukkit.event.Listener</pre>
<td class="colFirst"><code><a href="../../../../com/massivecraft/factions/SavageFactions.html"
title="class in com.massivecraft.factions">SavageFactions</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../../../com/massivecraft/factions/listeners/FactionsEntityListener.html#savageFactions">savageFactions</a></span></code>&nbsp;
href="../../../../com/massivecraft/factions/listeners/FactionsEntityListener.html#saberFactions">saberFactions</a></span></code>&nbsp;
</td>
</tr>
</table>
@ -157,7 +157,7 @@ implements org.bukkit.event.Listener</pre>
<tr class="altColor">
<td class="colOne"><code><span class="memberNameLink"><a
href="../../../../com/massivecraft/factions/listeners/FactionsEntityListener.html#FactionsEntityListener-com.massivecraft.factions.SavageFactions-">FactionsEntityListener</a></span>(<a
href="../../../../com/massivecraft/factions/SavageFactions.html" title="class in com.massivecraft.factions">SavageFactions</a>&nbsp;savageFactions)</code>&nbsp;
href="../../../../com/massivecraft/factions/SavageFactions.html" title="class in com.massivecraft.factions">SavageFactions</a>&nbsp;saberFactions)</code>&nbsp;
</td>
</tr>
</table>
@ -276,14 +276,14 @@ implements org.bukkit.event.Listener</pre>
<!-- -->
</a>
<h3>Field Detail</h3>
<a name="savageFactions">
<a name="saberFactions">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
<h4>savageFactions</h4>
<h4>saberFactions</h4>
<pre>public&nbsp;<a href="../../../../com/massivecraft/factions/SavageFactions.html"
title="class in com.massivecraft.factions">SavageFactions</a> savageFactions</pre>
title="class in com.massivecraft.factions">SavageFactions</a> saberFactions</pre>
</li>
</ul>
</li>
@ -301,7 +301,7 @@ implements org.bukkit.event.Listener</pre>
<li class="blockList">
<h4>FactionsEntityListener</h4>
<pre>public&nbsp;FactionsEntityListener(<a href="../../../../com/massivecraft/factions/SavageFactions.html"
title="class in com.massivecraft.factions">SavageFactions</a>&nbsp;savageFactions)</pre>
title="class in com.massivecraft.factions">SavageFactions</a>&nbsp;saberFactions)</pre>
</li>
</ul>
</li>

4
javadoc/com/massivecraft/factions/listeners/FactionsPlayerListener.html
View File

@ -135,7 +135,7 @@ implements org.bukkit.event.Listener</pre>
<tr class="altColor">
<td class="colOne"><code><span class="memberNameLink"><a
href="../../../../com/massivecraft/factions/listeners/FactionsPlayerListener.html#FactionsPlayerListener-com.massivecraft.factions.SavageFactions-">FactionsPlayerListener</a></span>(<a
href="../../../../com/massivecraft/factions/SavageFactions.html" title="class in com.massivecraft.factions">SavageFactions</a>&nbsp;savageFactions)</code>&nbsp;
href="../../../../com/massivecraft/factions/SavageFactions.html" title="class in com.massivecraft.factions">SavageFactions</a>&nbsp;saberFactions)</code>&nbsp;
</td>
</tr>
</table>
@ -290,7 +290,7 @@ implements org.bukkit.event.Listener</pre>
<li class="blockList">
<h4>FactionsPlayerListener</h4>
<pre>public&nbsp;FactionsPlayerListener(<a href="../../../../com/massivecraft/factions/SavageFactions.html"
title="class in com.massivecraft.factions">SavageFactions</a>&nbsp;savageFactions)</pre>
title="class in com.massivecraft.factions">SavageFactions</a>&nbsp;saberFactions)</pre>
</li>
</ul>
</li>

6
javadoc/index-files/index-18.html
View File

@ -86,19 +86,19 @@
<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/Conf.html#safeZonePreventAllDamageToPlayers">safeZonePreventAllDamageToPlayers</a></span> - Static variable in class com.massivecraft.factions.<a href="../com/massivecraft/factions/Conf.html" title="class in com.massivecraft.factions">Conf</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a
href="../com/massivecraft/factions/listeners/FactionsBlockListener.html#savageFactions">savageFactions</a></span>
href="../com/massivecraft/factions/listeners/FactionsBlockListener.html#saberFactions">saberFactions</a></span>
- Variable in class com.massivecraft.factions.listeners.<a
href="../com/massivecraft/factions/listeners/FactionsBlockListener.html"
title="class in com.massivecraft.factions.listeners">FactionsBlockListener</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a
href="../com/massivecraft/factions/listeners/FactionsChatListener.html#savageFactions">savageFactions</a></span>
href="../com/massivecraft/factions/listeners/FactionsChatListener.html#saberFactions">saberFactions</a></span>
- Variable in class com.massivecraft.factions.listeners.<a
href="../com/massivecraft/factions/listeners/FactionsChatListener.html"
title="class in com.massivecraft.factions.listeners">FactionsChatListener</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a
href="../com/massivecraft/factions/listeners/FactionsEntityListener.html#savageFactions">savageFactions</a></span>
href="../com/massivecraft/factions/listeners/FactionsEntityListener.html#saberFactions">saberFactions</a></span>
- Variable in class com.massivecraft.factions.listeners.<a
href="../com/massivecraft/factions/listeners/FactionsEntityListener.html"
title="class in com.massivecraft.factions.listeners">FactionsEntityListener</a></dt>

2
pom.xml
View File

@ -330,7 +330,7 @@
</dependency>
<dependency>
<groupId>net.coreprotect</groupId>
<artifactId>coreprotect</artifactId>
<artifactId>CoreProtect</artifactId>
<version>2</version>
<scope>provided</scope>
</dependency>

70
src/main/java/com/massivecraft/factions/cmd/CmdInventorySee.java Normal file
View File

@ -0,0 +1,70 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.fperms.Access;
import com.massivecraft.factions.zcore.fperms.PermissableAction;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import java.util.ArrayList;
import java.util.Objects;
public class CmdInventorySee extends FCommand {
public CmdInventorySee() {
super();
this.aliases.add("invsee");
this.aliases.add("inventorysee");
this.requiredArgs.add("member name");
this.permission = Permission.INVSEE.node;
this.disableOnLock = true;
this.disableOnSpam = false;
senderMustBePlayer = true;
senderMustBeMember = true;
senderMustBeModerator = false;
senderMustBeColeader = false;
senderMustBeAdmin = false;
}
@Override
public void perform() {
if (SaberFactions.plugin.getConfig().getBoolean("f-inventory-see.Enabled")) {
fme.msg(TL.GENERIC_DISABLED);
}
Access use = myFaction.getAccess(fme, PermissableAction.TERRITORY);
if (use == Access.DENY || (use == Access.UNDEFINED && !assertMinRole(Role.MODERATOR))) {
fme.msg(TL.GENERIC_NOPERMISSION, "territory");
return;
}
ArrayList<Player> fplayers = myFaction.getOnlinePlayers();
FPlayer targetInv = argAsFPlayer(0);
if (targetInv == null || !fplayers.contains(targetInv.getPlayer())) {
fme.msg(TL.PLAYER_NOT_FOUND, Objects.requireNonNull(targetInv).toString());
return;
}
Inventory inventory = Bukkit.createInventory(me, 36, targetInv.getName() + "'s Inventory");
for (int i = 0; i < 36; i++)
if (targetInv.getPlayer().getInventory().getItem(i) != null)
inventory.setItem(i, targetInv.getPlayer().getInventory().getItem(i));
me.openInventory(inventory);
}
@Override
public TL getUsageTranslation() {
return TL.COMMAND_INVENTORYSEE_DESCRIPTION;
}
}

5
src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java
View File

@ -110,6 +110,7 @@ public class FCmdRoot extends FCommand {
public CmdAlts cmdAlts = new CmdAlts();
public CmdSpam cmdSpam = new CmdSpam();
public CmdCorner cmdCorner = new CmdCorner();
public CmdInventorySee cmdInventorySee = new CmdInventorySee();
@ -228,6 +229,10 @@ public class FCmdRoot extends FCommand {
this.addSubCommand(this.cmdCorner);
if (SaberFactions.plugin.getConfig().getBoolean("f-inventory-see.Enabled")) {
this.addSubCommand(this.cmdInventorySee);
}
if(SaberFactions.plugin.getConfig().getBoolean("f-alts.Enabled")){
this.addSubCommand(cmdAlts);
}

11
src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
View File

@ -668,6 +668,17 @@ public class FactionsPlayerListener implements Listener {
}
}
@EventHandler
public void onInentorySee(InventoryClickEvent e) {
if (e.getCurrentItem() == null)
return;
if (!e.getInventory().getName().endsWith("'s Inventory View"))
return;
e.setCancelled(true);
}
@EventHandler
public void onPlayerBoneMeal(PlayerInteractEvent event) {
Block block = event.getClickedBlock();

1
src/main/java/com/massivecraft/factions/struct/Permission.java
View File

@ -37,6 +37,7 @@ public enum Permission {
HELP("help"),
HOME("home"),
INVITE("invite"),
INVSEE("invsee"),
JOIN("join"),
JOIN_ANY("join.any"),
JOIN_OTHERS("join.others"),

6
src/main/java/com/massivecraft/factions/zcore/util/TL.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2018 ProSavage
* Copyright (C) 2019 Driftay
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -351,6 +351,8 @@ public enum TL {
COMMAND_HOME_DESCRIPTION("Teleport to the faction home"),
COMMAND_HOME_BLOCKED("&c&l[!] You may not teleport to a home that is claimed by &b%1$s"),
COMMAND_INVENTORYSEE_DESCRIPTION("View a faction members inventory"),
COMMAND_INSPECT_DISABLED_MSG("&c&l[!]&7 Inspect mode is now &cdisabled."),
COMMAND_INSPECT_DISABLED_NOFAC("&c&l[!]&7 Inspect mode is now &cdisabled,&7 because you &cdo not have a faction!"),
COMMAND_INSPECT_ENABLED("&c&l[!]&7 Inspect mode is now &aEnabled."),
@ -899,6 +901,8 @@ public enum TL {
GENERIC_MONEYTAKE("&c{amount} has been taken from your account."),
PLAYER_NOT_FOUND("&c&l[!] &b%1$s &7is either not online or not in your faction!"),
WARBANNER_NOFACTION("&cYou need a faction to use a warbanner!"),
WARBANNER_COOLDOWN("&cThe warbanner is on cooldown for your faction!"),
WARBANNER_INVALIDLOC("&cYou can only use warbanners in enemy land or the warzone"),

12
src/main/resources/config.yml
View File

@ -1,7 +1,7 @@
# SaberFactions by Driftay
# Report issues: https://github.com/Driftay/SaberFactions/issues/new
# Live support: https://discord.gg/22AQtX7
# Spigot Site: https://www.spigotmc.org/resources/savagefactions-factionsuuid-reimagined-1-7-1-12.52891/
# Live support: https://discord.gg/TFxWKeX
# Spigot Site: https://www.spigotmc.org/resources/saberfactions-1-7-1-13-the-complete-factions-solution.68840/
# Website: https://www.saberllc.net/
# Jenkins: https://jenkins.saberllc.net/
@ -711,7 +711,13 @@ faction-disband-broadcast: true
############################################################
See-Invisible-Faction-Members: false
############################################################
# +------------------------------------------------------+ #
# | Faction Inventory See | #
# +------------------------------------------------------+ #
############################################################
f-inventory-see:
Enabled: true
############################################################
# +------------------------------------------------------+ #
# | Faction Alt Accounts | #