mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-19 19:25:48 +00:00
[CI skip] Some minor changes
This commit is contained in:
parent
ae782d9d7a
commit
dcd7146949
@ -36,12 +36,14 @@
|
|||||||
* Added translations for Recipe Types
|
* Added translations for Recipe Types
|
||||||
|
|
||||||
### Changes
|
### Changes
|
||||||
|
* Researches now use their namespaced keys in the Researches.yml
|
||||||
|
|
||||||
### Fixes
|
### Fixes
|
||||||
* Fixed #1553
|
* Fixed #1553
|
||||||
* Fixed #1513
|
* Fixed #1513
|
||||||
* Fixed #1557
|
* Fixed #1557
|
||||||
* Fixed #1558
|
* Fixed #1558
|
||||||
|
* Fixed a translation not showing properly
|
||||||
|
|
||||||
## Release Candidate 6 (16 Feb 2020)
|
## Release Candidate 6 (16 Feb 2020)
|
||||||
|
|
||||||
|
@ -449,7 +449,7 @@ public class ChestSlimefunGuide implements ISlimefunGuide {
|
|||||||
ChestMenu menu = create(p);
|
ChestMenu menu = create(p);
|
||||||
|
|
||||||
if (item.hasWiki()) {
|
if (item.hasWiki()) {
|
||||||
menu.addItem(8, new CustomItem(Material.KNOWLEDGE_BOOK, ChatColor.RESET + SlimefunPlugin.getLocal().getMessage("guide.tooltips.wiki"), "", ChatColor.GRAY + "\u21E8 " + ChatColor.GREEN + SlimefunPlugin.getLocal().getMessage(p, "guide.tooltips.open-category")));
|
menu.addItem(8, new CustomItem(Material.KNOWLEDGE_BOOK, ChatColor.RESET + SlimefunPlugin.getLocal().getMessage(p, "guide.tooltips.wiki"), "", ChatColor.GRAY + "\u21E8 " + ChatColor.GREEN + SlimefunPlugin.getLocal().getMessage(p, "guide.tooltips.open-category")));
|
||||||
menu.addMenuClickHandler(8, (pl, slot, itemstack, action) -> {
|
menu.addMenuClickHandler(8, (pl, slot, itemstack, action) -> {
|
||||||
pl.closeInventory();
|
pl.closeInventory();
|
||||||
ChatUtils.sendURL(pl, item.getWiki());
|
ChatUtils.sendURL(pl, item.getWiki());
|
||||||
|
@ -89,7 +89,7 @@ public class Translators {
|
|||||||
addTranslator("mohkamfer", "citBabY", "ar", false);
|
addTranslator("mohkamfer", "citBabY", "ar", false);
|
||||||
|
|
||||||
// Translators - Japanese
|
// Translators - Japanese
|
||||||
addTranslator("bito-blosh", "ja", true);
|
addTranslator("bito-blosh", "Bloshop", "ja", true);
|
||||||
|
|
||||||
// Translators - Portuguese (Brazil)
|
// Translators - Portuguese (Brazil)
|
||||||
addTranslator("G4stavoM1ster", "pt-BR", true);
|
addTranslator("G4stavoM1ster", "pt-BR", true);
|
||||||
|
@ -360,7 +360,12 @@ public final class SlimefunItemSetup {
|
|||||||
.register(plugin);
|
.register(plugin);
|
||||||
|
|
||||||
SlimefunManager.registerArmorSet(new ItemStack(Material.GLOWSTONE), new ItemStack[] {SlimefunItems.GLOWSTONE_HELMET, SlimefunItems.GLOWSTONE_CHESTPLATE, SlimefunItems.GLOWSTONE_LEGGINGS, SlimefunItems.GLOWSTONE_BOOTS}, "GLOWSTONE",
|
SlimefunManager.registerArmorSet(new ItemStack(Material.GLOWSTONE), new ItemStack[] {SlimefunItems.GLOWSTONE_HELMET, SlimefunItems.GLOWSTONE_CHESTPLATE, SlimefunItems.GLOWSTONE_LEGGINGS, SlimefunItems.GLOWSTONE_BOOTS}, "GLOWSTONE",
|
||||||
new PotionEffect[][] {new PotionEffect[] {new PotionEffect(PotionEffectType.NIGHT_VISION, 600, 0)}, new PotionEffect[] {new PotionEffect(PotionEffectType.NIGHT_VISION, 600, 0)}, new PotionEffect[] {new PotionEffect(PotionEffectType.NIGHT_VISION, 600, 0)}, new PotionEffect[] {new PotionEffect(PotionEffectType.NIGHT_VISION, 600, 0)}}, true, true);
|
new PotionEffect[][] {
|
||||||
|
new PotionEffect[] {new PotionEffect(PotionEffectType.NIGHT_VISION, 600, 0)},
|
||||||
|
new PotionEffect[] {new PotionEffect(PotionEffectType.NIGHT_VISION, 600, 0)},
|
||||||
|
new PotionEffect[] {new PotionEffect(PotionEffectType.NIGHT_VISION, 600, 0)},
|
||||||
|
new PotionEffect[] {new PotionEffect(PotionEffectType.NIGHT_VISION, 600, 0)}
|
||||||
|
}, true, plugin);
|
||||||
|
|
||||||
SlimefunManager.registerArmorSet(SlimefunItems.DAMASCUS_STEEL_INGOT, new ItemStack[] {SlimefunItems.DAMASCUS_STEEL_HELMET, SlimefunItems.DAMASCUS_STEEL_CHESTPLATE, SlimefunItems.DAMASCUS_STEEL_LEGGINGS, SlimefunItems.DAMASCUS_STEEL_BOOTS}, "DAMASCUS_STEEL", true, false);
|
SlimefunManager.registerArmorSet(SlimefunItems.DAMASCUS_STEEL_INGOT, new ItemStack[] {SlimefunItems.DAMASCUS_STEEL_HELMET, SlimefunItems.DAMASCUS_STEEL_CHESTPLATE, SlimefunItems.DAMASCUS_STEEL_LEGGINGS, SlimefunItems.DAMASCUS_STEEL_BOOTS}, "DAMASCUS_STEEL", true, false);
|
||||||
|
|
||||||
|
@ -1,11 +1,8 @@
|
|||||||
package me.mrCookieSlime.Slimefun.Objects;
|
package me.mrCookieSlime.Slimefun.Objects;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.UUID;
|
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
@ -13,7 +10,6 @@ import org.bukkit.GameMode;
|
|||||||
import org.bukkit.Keyed;
|
import org.bukkit.Keyed;
|
||||||
import org.bukkit.NamespacedKey;
|
import org.bukkit.NamespacedKey;
|
||||||
import org.bukkit.Sound;
|
import org.bukkit.Sound;
|
||||||
import org.bukkit.command.CommandSender;
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
import io.github.thebusybiscuit.cscorelib2.data.PersistentDataAPI;
|
import io.github.thebusybiscuit.cscorelib2.data.PersistentDataAPI;
|
||||||
@ -140,34 +136,6 @@ public class Research implements Keyed {
|
|||||||
return items;
|
return items;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Convenience method to check if the player unlocked this research.
|
|
||||||
*
|
|
||||||
* @param p Player to check
|
|
||||||
* @return true if he unlocked the research, otherwise false
|
|
||||||
*
|
|
||||||
* @since 4.0
|
|
||||||
* @see #hasUnlocked(UUID)
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public boolean hasUnlocked(Player p) {
|
|
||||||
return hasUnlocked(p.getUniqueId());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks if the player unlocked this research.
|
|
||||||
*
|
|
||||||
* @param uuid UUID of the player to check
|
|
||||||
* @return true if he unlocked the research, otherwise false
|
|
||||||
*
|
|
||||||
* @since 4.0
|
|
||||||
* @see #hasUnlocked(Player)
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public boolean hasUnlocked(UUID uuid) {
|
|
||||||
return PlayerProfile.fromUUID(uuid).hasUnlocked(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks if the player can unlock this research.
|
* Checks if the player can unlock this research.
|
||||||
*
|
*
|
||||||
@ -246,8 +214,11 @@ public class Research implements Keyed {
|
|||||||
*/
|
*/
|
||||||
public void register() {
|
public void register() {
|
||||||
SlimefunPlugin.getResearchCfg().setDefaultValue("enable-researching", true);
|
SlimefunPlugin.getResearchCfg().setDefaultValue("enable-researching", true);
|
||||||
|
|
||||||
|
String path = key.getNamespace() + "." + key.getKey();
|
||||||
|
migrate(id, path);
|
||||||
|
|
||||||
if (SlimefunPlugin.getResearchCfg().contains(this.getID() + ".enabled") && !SlimefunPlugin.getResearchCfg().getBoolean(this.getID() + ".enabled")) {
|
if (SlimefunPlugin.getResearchCfg().contains(path + ".enabled") && !SlimefunPlugin.getResearchCfg().getBoolean(path + ".enabled")) {
|
||||||
Iterator<SlimefunItem> iterator = items.iterator();
|
Iterator<SlimefunItem> iterator = items.iterator();
|
||||||
while (iterator.hasNext()) {
|
while (iterator.hasNext()) {
|
||||||
SlimefunItem item = iterator.next();
|
SlimefunItem item = iterator.next();
|
||||||
@ -257,11 +228,11 @@ public class Research implements Keyed {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
SlimefunPlugin.getResearchCfg().setDefaultValue(this.getID() + ".cost", this.getCost());
|
SlimefunPlugin.getResearchCfg().setDefaultValue(path + ".cost", this.getCost());
|
||||||
SlimefunPlugin.getResearchCfg().setDefaultValue(this.getID() + ".enabled", true);
|
SlimefunPlugin.getResearchCfg().setDefaultValue(path + ".enabled", true);
|
||||||
|
|
||||||
this.cost = SlimefunPlugin.getResearchCfg().getInt(this.getID() + ".cost");
|
this.cost = SlimefunPlugin.getResearchCfg().getInt(path + ".cost");
|
||||||
this.enabled = SlimefunPlugin.getResearchCfg().getBoolean(this.getID() + ".enabled");
|
this.enabled = SlimefunPlugin.getResearchCfg().getBoolean(path + ".enabled");
|
||||||
|
|
||||||
SlimefunPlugin.getRegistry().getResearches().add(this);
|
SlimefunPlugin.getRegistry().getResearches().add(this);
|
||||||
SlimefunPlugin.getRegistry().getResearchIds().add(this);
|
SlimefunPlugin.getRegistry().getResearchIds().add(this);
|
||||||
@ -271,6 +242,18 @@ public class Research implements Keyed {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void migrate(int id, String path) {
|
||||||
|
if (SlimefunPlugin.getResearchCfg().contains(id + ".enabled")) {
|
||||||
|
SlimefunPlugin.getResearchCfg().setValue(path + ".enabled", SlimefunPlugin.getResearchCfg().getBoolean(id + ".enabled"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (SlimefunPlugin.getResearchCfg().contains(id + ".cost")) {
|
||||||
|
SlimefunPlugin.getResearchCfg().setValue(path + ".cost", SlimefunPlugin.getResearchCfg().getInt(id + ".cost"));
|
||||||
|
}
|
||||||
|
|
||||||
|
SlimefunPlugin.getResearchCfg().setValue(String.valueOf(id), null);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets if the specified player is currently unlocking a research.
|
* Gets if the specified player is currently unlocking a research.
|
||||||
*
|
*
|
||||||
@ -283,21 +266,6 @@ public class Research implements Keyed {
|
|||||||
return SlimefunPlugin.getRegistry().getCurrentlyResearchingPlayers().contains(p.getUniqueId());
|
return SlimefunPlugin.getRegistry().getCurrentlyResearchingPlayers().contains(p.getUniqueId());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the title of the specified player.
|
|
||||||
*
|
|
||||||
* @param p Player to get the rank
|
|
||||||
* @param researched List of the player's unlocked researches
|
|
||||||
* @return the title of the specified player
|
|
||||||
*
|
|
||||||
* @since 4.0
|
|
||||||
* @see #sendStats(CommandSender, Player)
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public static String getTitle(Player p, Collection<Research> researched) {
|
|
||||||
return PlayerProfile.get(p).getTitle();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Attempts to get the research with the given ID.
|
* Attempts to get the research with the given ID.
|
||||||
*
|
*
|
||||||
@ -312,24 +280,6 @@ public class Research implements Keyed {
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the list of unlocked researches for a player using his UUID.
|
|
||||||
*
|
|
||||||
* @param uuid UUID of the player
|
|
||||||
* @return the list of unlocked researches for the player
|
|
||||||
*
|
|
||||||
* @since 4.0
|
|
||||||
* @see #getResearches(String)
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public static List<Research> getResearches(UUID uuid) {
|
|
||||||
List<Research> researched = new ArrayList<>();
|
|
||||||
for (Research research : SlimefunPlugin.getRegistry().getResearches()) {
|
|
||||||
if (research.hasUnlocked(uuid)) researched.add(research);
|
|
||||||
}
|
|
||||||
return researched;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
|
@ -12,6 +12,7 @@ import org.bukkit.inventory.meta.ItemMeta;
|
|||||||
import org.bukkit.potion.PotionEffect;
|
import org.bukkit.potion.PotionEffect;
|
||||||
|
|
||||||
import io.github.thebusybiscuit.cscorelib2.item.ImmutableItemMeta;
|
import io.github.thebusybiscuit.cscorelib2.item.ImmutableItemMeta;
|
||||||
|
import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon;
|
||||||
import io.github.thebusybiscuit.slimefun4.core.attributes.Soulbound;
|
import io.github.thebusybiscuit.slimefun4.core.attributes.Soulbound;
|
||||||
import me.mrCookieSlime.EmeraldEnchants.EmeraldEnchants;
|
import me.mrCookieSlime.EmeraldEnchants.EmeraldEnchants;
|
||||||
import me.mrCookieSlime.EmeraldEnchants.ItemEnchantment;
|
import me.mrCookieSlime.EmeraldEnchants.ItemEnchantment;
|
||||||
@ -32,9 +33,9 @@ public final class SlimefunManager {
|
|||||||
|
|
||||||
private SlimefunManager() {}
|
private SlimefunManager() {}
|
||||||
|
|
||||||
public static void registerArmorSet(ItemStack baseComponent, ItemStack[] items, String idSyntax, PotionEffect[][] effects, boolean special, boolean slimefun) {
|
public static void registerArmorSet(ItemStack baseComponent, ItemStack[] items, String idSyntax, PotionEffect[][] effects, boolean magical, SlimefunAddon addon) {
|
||||||
String[] components = new String[] {"_HELMET", "_CHESTPLATE", "_LEGGINGS", "_BOOTS"};
|
String[] components = new String[] {"_HELMET", "_CHESTPLATE", "_LEGGINGS", "_BOOTS"};
|
||||||
Category category = special ? Categories.MAGIC_ARMOR: Categories.ARMOR;
|
Category category = magical ? Categories.MAGIC_ARMOR: Categories.ARMOR;
|
||||||
List<ItemStack[]> recipes = new ArrayList<>();
|
List<ItemStack[]> recipes = new ArrayList<>();
|
||||||
|
|
||||||
recipes.add(new ItemStack[] {baseComponent, baseComponent, baseComponent, baseComponent, null, baseComponent, null, null, null});
|
recipes.add(new ItemStack[] {baseComponent, baseComponent, baseComponent, baseComponent, null, baseComponent, null, null, null});
|
||||||
@ -44,10 +45,10 @@ public final class SlimefunManager {
|
|||||||
|
|
||||||
for (int i = 0; i < 4; i++) {
|
for (int i = 0; i < 4; i++) {
|
||||||
if (i < effects.length && effects[i].length > 0) {
|
if (i < effects.length && effects[i].length > 0) {
|
||||||
new SlimefunArmorPiece(category, new SlimefunItemStack(idSyntax + components[i], items[i]), RecipeType.ARMOR_FORGE, recipes.get(i), effects[i]).register(slimefun);
|
new SlimefunArmorPiece(category, new SlimefunItemStack(idSyntax + components[i], items[i]), RecipeType.ARMOR_FORGE, recipes.get(i), effects[i]).register(addon);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
new SlimefunItem(category, new SlimefunItemStack(idSyntax + components[i], items[i]), RecipeType.ARMOR_FORGE, recipes.get(i)).register(slimefun);
|
new SlimefunItem(category, new SlimefunItemStack(idSyntax + components[i], items[i]), RecipeType.ARMOR_FORGE, recipes.get(i)).register(addon);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user