mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity

Minor changes in Talisman and EnderTalisman

Browse Source 
Renamed consumed field to consumable
Added javadoc : since

Talisman -
Field initialisation inline instead of in constructors
Simplified a condition
This commit is contained in:
Florian CUNY 2017-12-09 15:46:50 +01:00
parent 858f964b82
commit 6cb081cfd3
2 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnderTalisman.java
View File

@ -7,17 +7,20 @@ import me.mrCookieSlime.Slimefun.api.Slimefun;
import org.bukkit.inventory.ItemStack;
import org.bukkit.potion.PotionEffect;
/**
* @since 4.0
*/
public class EnderTalisman extends SlimefunItem {
private boolean consumed;
private String suffix;
private boolean consumable;
private boolean cancel;
private PotionEffect[] effects;
private String suffix;
private int chance;
public EnderTalisman(Talisman parent) {
super(Categories.TALISMANS_2, parent.upgrade(), "ENDER_" + parent.getID(), RecipeType.MAGIC_WORKBENCH, new ItemStack[] {SlimefunItem.getItem("ENDER_LUMP_3"), null, SlimefunItem.getItem("ENDER_LUMP_3"), null, parent.getItem(), null, SlimefunItem.getItem("ENDER_LUMP_3"), null, SlimefunItem.getItem("ENDER_LUMP_3")}, parent.upgrade());
this.consumed = parent.isConsumable();
this.consumable = parent.isConsumable();
this.cancel = parent.isEventCancelled();
this.suffix = parent.getSuffix();
this.effects = parent.getEffects();
@ -25,9 +28,9 @@ public class EnderTalisman extends SlimefunItem {
Slimefun.addHint("ENDER_" + parent.getID(), "&eEnder Talismans have the advantage", "&eof still working while they", "&eare in your Ender Chest");
}
public PotionEffect[] getEffects() { return this.effects; }
public boolean isConsumable() { return this.consumed; }
public boolean isEventCancelled() { return this.cancel; }
public String getSuffix() { return this.suffix; }
public boolean isConsumable() { return this.consumable; }
public boolean isEventCancelled() { return this.cancel; }
public PotionEffect[] getEffects() { return this.effects; }
public int getChance() { return this.chance; }
}

26
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Talisman.java
View File

@ -23,26 +23,28 @@ import org.bukkit.event.player.PlayerEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.potion.PotionEffect;
/**
* @since 4.0
*/
public class Talisman extends SlimefunItem {
private boolean consumed;
private boolean cancel;
private PotionEffect[] effects;
private String suffix;
private int chance;
private boolean consumable = true;
private boolean cancel = true;
private PotionEffect[] effects = new PotionEffect[0];
private int chance = 100;
public Talisman(ItemStack item, String id, ItemStack[] recipe, boolean consumable, boolean cancelEvent, String messageSuffix, PotionEffect... effects) {
super(Categories.TALISMANS_1, item, id, RecipeType.MAGIC_WORKBENCH, recipe, new CustomItem(item, consumable ? 4: 1));
this.consumed = consumable;
this.consumable = consumable;
this.cancel = cancelEvent;
this.suffix = messageSuffix;
this.effects = effects;
this.chance = 100;
}
public Talisman(ItemStack item, String id, ItemStack[] recipe, boolean consumable, boolean cancelEvent, String messageSuffix, int chance, PotionEffect... effects) {
super(Categories.TALISMANS_1, item, id, RecipeType.MAGIC_WORKBENCH, recipe, new CustomItem(item, consumable ? 4: 1));
this.consumed = consumable;
this.consumable = consumable;
this.cancel = cancelEvent;
this.suffix = messageSuffix;
this.effects = effects;
@ -51,23 +53,21 @@ public class Talisman extends SlimefunItem {
public Talisman(ItemStack item, String id, ItemStack[] recipe, String messageSuffix, int chance, PotionEffect... effects) {
super(Categories.TALISMANS_1, item, id, RecipeType.MAGIC_WORKBENCH, recipe, item);
this.consumed = true;
this.cancel = true;
this.suffix = messageSuffix;
this.effects = effects;
this.chance = chance;
}
public PotionEffect[] getEffects() { return this.effects; }
public boolean isConsumable() { return this.consumed; }
public boolean isEventCancelled() { return this.cancel; }
public String getSuffix() { return this.suffix; }
public boolean isConsumable() { return this.consumable; }
public boolean isEventCancelled() { return this.cancel; }
public PotionEffect[] getEffects() { return this.effects; }
public int getChance() { return this.chance; }
public static boolean checkFor(Event e, SlimefunItem talisman) {
if (talisman != null) {
if (talisman instanceof Talisman) {
boolean message = ((Talisman) talisman).getSuffix().equalsIgnoreCase("") ? false: true;
boolean message = !((Talisman) talisman).getSuffix().equalsIgnoreCase("");
if (SlimefunStartup.chance(100, ((Talisman) talisman).getChance())) {
Player p = null;