TotalFreedomMC/PlayerParticles
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/PlayerParticles.git synced 2025-01-05 22:28:22 +00:00
Code Issues Projects Releases Wiki Activity

Certain icons can be hidden under certain conditions on the main GUI screen now

Browse source
This commit is contained in:
Esophose 2018-12-03 02:45:50 -07:00
parent a95aaa52d2
commit a6ca986f50
3 changed files with 54 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/com/esophose/playerparticles/PlayerParticles.java
View file

@ -1,8 +1,4 @@
/* /*
* TODO: v6.1
* + Add \n support for GUI messages to break lore onto a new line
* * Make the GUI ignore empty lore lines rather than putting an empty line there
*
* TODO: v6.2 * TODO: v6.2
* + Add new style 'tornado' * + Add new style 'tornado'
* + Add new style 'doubleorbit' * + Add new style 'doubleorbit'

58
src/com/esophose/playerparticles/gui/GuiInventoryDefault.java
View file

@ -13,6 +13,7 @@ import org.bukkit.inventory.meta.SkullMeta;
import com.esophose.playerparticles.manager.DataManager; import com.esophose.playerparticles.manager.DataManager;
import com.esophose.playerparticles.manager.LangManager; import com.esophose.playerparticles.manager.LangManager;
import com.esophose.playerparticles.manager.LangManager.Lang; import com.esophose.playerparticles.manager.LangManager.Lang;
import com.esophose.playerparticles.manager.PermissionManager;
import com.esophose.playerparticles.manager.SettingManager.GuiIcon; import com.esophose.playerparticles.manager.SettingManager.GuiIcon;
import com.esophose.playerparticles.particles.PPlayer; import com.esophose.playerparticles.particles.PPlayer;
import com.esophose.playerparticles.particles.ParticleEffect.ParticleProperty; import com.esophose.playerparticles.particles.ParticleEffect.ParticleProperty;
@ -52,8 +53,27 @@ public class GuiInventoryDefault extends GuiInventory {
this.inventory.setItem(13, headIcon); this.inventory.setItem(13, headIcon);
// Define what slots to put the icons at based on what other slots are visible
boolean manageGroupsVisible = PermissionManager.canPlayerSaveGroups(pplayer);
boolean loadPresetGroupVisible = !ParticleGroup.getPresetGroupsForPlayer(pplayer.getPlayer()).isEmpty();
int manageParticlesSlot = -1, manageGroupsSlot = -1, loadPresetGroupSlot = -1;
if (!manageGroupsVisible && !loadPresetGroupVisible) {
manageParticlesSlot = 22;
} else if (!manageGroupsVisible) {
manageParticlesSlot = 21;
loadPresetGroupSlot = 23;
} else if (!loadPresetGroupVisible) {
manageParticlesSlot = 21;
manageGroupsSlot = 23;
} else {
manageParticlesSlot = 20;
manageGroupsSlot = 22;
loadPresetGroupSlot = 24;
}
// Manage Your Particles button // Manage Your Particles button
GuiActionButton manageYourParticlesButton = new GuiActionButton(20, GuiActionButton manageYourParticlesButton = new GuiActionButton(manageParticlesSlot,
GuiIcon.PARTICLES.get(), GuiIcon.PARTICLES.get(),
LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_MANAGE_YOUR_PARTICLES), LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_MANAGE_YOUR_PARTICLES),
new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_MANAGE_YOUR_PARTICLES_DESCRIPTION) }, new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_MANAGE_YOUR_PARTICLES_DESCRIPTION) },
@ -63,24 +83,28 @@ public class GuiInventoryDefault extends GuiInventory {
this.actionButtons.add(manageYourParticlesButton); this.actionButtons.add(manageYourParticlesButton);
// Manage Your Groups button // Manage Your Groups button
GuiActionButton manageYourGroupsButton = new GuiActionButton(22, if (manageGroupsVisible) {
GuiIcon.GROUPS.get(), GuiActionButton manageYourGroupsButton = new GuiActionButton(manageGroupsSlot,
LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_MANAGE_YOUR_GROUPS), GuiIcon.GROUPS.get(),
new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_MANAGE_YOUR_GROUPS_DESCRIPTION) }, LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_MANAGE_YOUR_GROUPS),
(button, isShiftClick) -> { new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_MANAGE_YOUR_GROUPS_DESCRIPTION) },
GuiHandler.transition(new GuiInventoryManageGroups(pplayer)); (button, isShiftClick) -> {
}); GuiHandler.transition(new GuiInventoryManageGroups(pplayer));
this.actionButtons.add(manageYourGroupsButton); });
this.actionButtons.add(manageYourGroupsButton);
}
// Load Preset Groups // Load Preset Groups
GuiActionButton loadPresetGroups = new GuiActionButton(24, if (loadPresetGroupVisible) {
GuiIcon.PRESET_GROUPS.get(), GuiActionButton loadPresetGroups = new GuiActionButton(loadPresetGroupSlot,
LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_LOAD_A_PRESET_GROUP), GuiIcon.PRESET_GROUPS.get(),
new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_LOAD_A_PRESET_GROUP_DESCRIPTION) }, LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_LOAD_A_PRESET_GROUP),
(button, isShiftClick) -> { new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_LOAD_A_PRESET_GROUP_DESCRIPTION) },
GuiHandler.transition(new GuiInventoryLoadPresetGroups(pplayer)); (button, isShiftClick) -> {
}); GuiHandler.transition(new GuiInventoryLoadPresetGroups(pplayer));
this.actionButtons.add(loadPresetGroups); });
this.actionButtons.add(loadPresetGroups);
}
final ParticlePair editingParticle = pplayer.getPrimaryParticle(); final ParticlePair editingParticle = pplayer.getPrimaryParticle();
boolean canEditPrimaryStyleAndData = pplayer.getActiveParticle(1) != null; boolean canEditPrimaryStyleAndData = pplayer.getActiveParticle(1) != null;

14
src/com/esophose/playerparticles/manager/PermissionManager.java
View file

@ -16,7 +16,7 @@ public class PermissionManager {
private static final String PERMISSION_PREFIX = "playerparticles."; private static final String PERMISSION_PREFIX = "playerparticles.";
public enum PPermission { private enum PPermission {
ALL("*"), ALL("*"),
EFFECT_ALL("effect.*"), EFFECT_ALL("effect.*"),
@ -92,6 +92,18 @@ public class PermissionManager {
return pplayer.getParticleGroups().size() - 1 >= PSetting.MAX_GROUPS.getInt(); return pplayer.getParticleGroups().size() - 1 >= PSetting.MAX_GROUPS.getInt();
} }
/**
* Checks if the given player is able to save groups
*
* @param pplayer The player to check
* @return If the player has permission to save groups
*/
public static boolean canPlayerSaveGroups(PPlayer pplayer) {
if (PPermission.ALL.check(pplayer.getPlayer())) return true;
if (PPermission.GROUPS_UNLIMITED.check(pplayer.getPlayer())) return true;
return PSetting.MAX_GROUPS.getInt() != 0;
}
/** /**
* Checks if the given player has reached the max number of fixed effects * Checks if the given player has reached the max number of fixed effects
* *