minster586/OpenInv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 Wiki Activity

Continue migrating terminology to "container"

Browse Source 
Clean up documentation a bit, prettify
This commit is contained in:
Jikoo
2022-05-15 10:45:52 -04:00
parent 6ad6e0c6bc
commit 0b761a6fc3
16 changed files with 249 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/src/main/java/com/lishid/openinv/InventoryListener.java
View File

@@ -53,7 +53,7 @@ record InventoryListener(OpenInv plugin) implements Listener {
return;
}
if (this.plugin.getPlayerSilentChestStatus(player)) {
if (this.plugin.getSilentContainerStatus(player)) {
this.plugin.getAnySilentContainer().deactivateContainer(player);
}

20
plugin/src/main/java/com/lishid/openinv/OpenInv.java
View File

@@ -133,21 +133,21 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
}
@Override
public boolean getPlayerAnyChestStatus(@NotNull final OfflinePlayer player) {
public boolean getAnyContainerStatus(@NotNull final OfflinePlayer offline) {
boolean defaultState = false;
if (player.isOnline()) {
Player onlinePlayer = player.getPlayer();
if (offline.isOnline()) {
Player onlinePlayer = offline.getPlayer();
if (onlinePlayer != null) {
defaultState = Permissions.ANY_DEFAULT.hasPermission(onlinePlayer);
}
}
return this.getConfig().getBoolean("toggles.any-chest." + this.getPlayerID(player), defaultState);
return this.getConfig().getBoolean("toggles.any-chest." + offline.getUniqueId(), defaultState);
}
@Override
public boolean getPlayerSilentChestStatus(@NotNull final OfflinePlayer offline) {
public boolean getSilentContainerStatus(@NotNull final OfflinePlayer offline) {
boolean defaultState = false;
if (offline.isOnline()) {
@@ -157,7 +157,7 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
}
}
return this.getConfig().getBoolean("toggles.silent-chest." + this.getPlayerID(offline), defaultState);
return this.getConfig().getBoolean("toggles.silent-chest." + offline.getUniqueId(), defaultState);
}
@Override
@@ -401,8 +401,8 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
}
@Override
public void setPlayerAnyChestStatus(@NotNull final OfflinePlayer offline, final boolean status) {
this.getConfig().set("toggles.any-chest." + this.getPlayerID(offline), status);
public void setAnyContainerStatus(@NotNull final OfflinePlayer offline, final boolean status) {
this.getConfig().set("toggles.any-chest." + offline.getUniqueId(), status);
this.saveConfig();
}
@@ -515,8 +515,8 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
}
@Override
public void setPlayerSilentChestStatus(@NotNull final OfflinePlayer offline, final boolean status) {
this.getConfig().set("toggles.silent-chest." + this.getPlayerID(offline), status);
public void setSilentContainerStatus(@NotNull final OfflinePlayer offline, final boolean status) {
this.getConfig().set("toggles.silent-chest." + offline.getUniqueId(), status);
this.saveConfig();
}

4
plugin/src/main/java/com/lishid/openinv/PlayerListener.java
View File

@@ -61,14 +61,14 @@ record PlayerListener(OpenInv plugin) implements Listener {
}
Player player = event.getPlayer();
boolean any = Permissions.ANYCHEST.hasPermission(player) && plugin.getPlayerAnyChestStatus(player);
boolean any = Permissions.ANYCHEST.hasPermission(player) && plugin.getAnyContainerStatus(player);
boolean needsAny = plugin.getAnySilentContainer().isAnyContainerNeeded(event.getClickedBlock());
if (!any && needsAny) {
return;
}
boolean silent = Permissions.SILENT.hasPermission(player) && plugin.getPlayerSilentChestStatus(player);
boolean silent = Permissions.SILENT.hasPermission(player) && plugin.getSilentContainerStatus(player);
// If anycontainer or silentcontainer is active
if (any || silent) {

9
plugin/src/main/java/com/lishid/openinv/commands/ContainerSettingCommand.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2011-2021 lishid. All rights reserved.
* Copyright (C) 2011-2022 lishid. All rights reserved.
*
* 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
@@ -39,15 +39,14 @@ public class ContainerSettingCommand implements TabExecutor {
@Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
if (!(sender instanceof Player)) {
if (!(sender instanceof Player player)) {
plugin.sendMessage(sender, "messages.error.consoleUnsupported");
return true;
}
Player player = (Player) sender;
boolean any = command.getName().startsWith("any");
Predicate<Player> getSetting = any ? plugin::getPlayerAnyChestStatus : plugin::getPlayerSilentChestStatus;
BiConsumer<OfflinePlayer, Boolean> setSetting = any ? plugin::setPlayerAnyChestStatus : plugin::setPlayerSilentChestStatus;
Predicate<Player> getSetting = any ? plugin::getAnyContainerStatus : plugin::getSilentContainerStatus;
BiConsumer<OfflinePlayer, Boolean> setSetting = any ? plugin::setAnyContainerStatus : plugin::setSilentContainerStatus;
if (args.length > 0) {
args[0] = args[0].toLowerCase();

2
plugin/src/main/java/com/lishid/openinv/commands/OpenInvCommand.java
View File

@@ -186,7 +186,7 @@ public class OpenInvCommand implements TabExecutor {
}
// Record the target
(openinv ? this.openInvHistory : this.openEnderHistory).put(player, this.plugin.getPlayerID(target));
(openinv ? this.openInvHistory : this.openEnderHistory).put(player, target.getUniqueId().toString());
// Create the inventory
final ISpecialInventory inv;

2
plugin/src/main/java/com/lishid/openinv/util/ConfigUpdater.java
View File

@@ -128,7 +128,7 @@ public record ConfigUpdater(OpenInv plugin) {
for (String playerName : keys) {
OfflinePlayer player = plugin.matchPlayer(playerName);
if (player != null) {
toggles.put(plugin.getPlayerID(player), section.getBoolean(playerName + ".toggle", false));
toggles.put(player.getUniqueId().toString(), section.getBoolean(playerName + ".toggle", false));
}
}