('\n' causes line breaks)

This commit is contained in:
ASangarin 2020-09-09 01:04:30 +02:00
commit 0796cdf795
6 changed files with 54 additions and 7 deletions

View File

@ -21,7 +21,7 @@ cache:
build: build:
stage: build stage: build
script: script:
- mvn $MAVEN_CLI_OPTS package - mvn $MAVEN_CLI_OPTS clean package
deploy: deploy:
stage: deploy stage: deploy

View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>net.Indyuce</groupId> <groupId>net.Indyuce</groupId>
<artifactId>MMOItems</artifactId> <artifactId>MMOItems</artifactId>
<version>6.1.0-SNAPSHOT</version> <version>6.1.1</version>
<name>MMOItems</name> <name>MMOItems</name>
<description>A great item solution for your RPG server.</description> <description>A great item solution for your RPG server.</description>

View File

@ -23,6 +23,7 @@ import net.Indyuce.mmoitems.comp.inventory.RPGInventoryHook;
import net.Indyuce.mmoitems.comp.itemglow.ItemGlowListener; import net.Indyuce.mmoitems.comp.itemglow.ItemGlowListener;
import net.Indyuce.mmoitems.comp.itemglow.NoGlowListener; import net.Indyuce.mmoitems.comp.itemglow.NoGlowListener;
import net.Indyuce.mmoitems.comp.mmocore.MMOCoreMMOLoader; import net.Indyuce.mmoitems.comp.mmocore.MMOCoreMMOLoader;
import net.Indyuce.mmoitems.comp.mmoinventory.MMOInventorySupport;
import net.Indyuce.mmoitems.comp.mythicmobs.MythicMobsLoader; import net.Indyuce.mmoitems.comp.mythicmobs.MythicMobsLoader;
import net.Indyuce.mmoitems.comp.parse.IridescentParser; import net.Indyuce.mmoitems.comp.parse.IridescentParser;
import net.Indyuce.mmoitems.comp.parse.StringInputParser; import net.Indyuce.mmoitems.comp.parse.StringInputParser;
@ -54,7 +55,7 @@ import java.util.logging.Level;
public class MMOItems extends JavaPlugin { public class MMOItems extends JavaPlugin {
public static MMOItems plugin; public static MMOItems plugin;
private final PluginUpdateManager pluginUpdateManager = new PluginUpdateManager(); private final PluginUpdateManager pluginUpdateManager = new PluginUpdateManager();
private final CraftingManager stationRecipeManager = new CraftingManager(); private final CraftingManager stationRecipeManager = new CraftingManager();
private final AbilityManager abilityManager = new AbilityManager(); private final AbilityManager abilityManager = new AbilityManager();
@ -111,7 +112,7 @@ public class MMOItems extends JavaPlugin {
typeManager.reload(); typeManager.reload();
templateManager.loadCompatibility(); // explained why here in method templateManager.loadCompatibility(); // explained why in method
if (Bukkit.getPluginManager().getPlugin("MMOCore") != null) if (Bukkit.getPluginManager().getPlugin("MMOCore") != null)
new MMOCoreMMOLoader(); new MMOCoreMMOLoader();
@ -131,6 +132,12 @@ public class MMOItems extends JavaPlugin {
getLogger().log(Level.INFO, "Hooked onto MythicMobs"); getLogger().log(Level.INFO, "Hooked onto MythicMobs");
} }
if (Bukkit.getPluginManager().getPlugin("MMOInventory") != null) {
new MMOInventorySupport();
getLogger().log(Level.INFO, "Hooked onto MMOInventory");
}
findRpgPlugin(); findRpgPlugin();
templateManager.reload(); templateManager.reload();
@ -285,7 +292,7 @@ public class MMOItems extends JavaPlugin {
} }
public String getPrefix() { public String getPrefix() {
return ChatColor.DARK_GRAY + "[" + ChatColor.YELLOW + "MMMOItems" + ChatColor.DARK_GRAY + "] " + ChatColor.GRAY; return ChatColor.DARK_GRAY + "[" + ChatColor.YELLOW + "MMOItems" + ChatColor.DARK_GRAY + "] " + ChatColor.GRAY;
} }
public File getJarFile() { public File getJarFile() {

View File

@ -0,0 +1,10 @@
package net.Indyuce.mmoitems.comp.mmoinventory;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.comp.mmoinventory.stat.AccessorySet;
public class MMOInventorySupport {
public MMOInventorySupport() {
MMOItems.plugin.getStats().register(new AccessorySet());
}
}

View File

@ -0,0 +1,30 @@
package net.Indyuce.mmoitems.comp.mmoinventory.stat;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.item.build.ItemStackBuilder;
import net.Indyuce.mmoitems.gui.edition.EditionInventory;
import net.Indyuce.mmoitems.stat.data.type.StatData;
import net.Indyuce.mmoitems.stat.type.StringStat;
import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.item.ItemTag;
import net.mmogroup.mmolib.version.VersionMaterial;
import org.bukkit.ChatColor;
public class AccessorySet extends StringStat {
public AccessorySet() {
super("ACCESSORY_SET", VersionMaterial.OAK_SIGN.toItem(), "Accessory Set (MMOInventory)", new String[] { "Used with MMOInventory's unique", "restriction to only allow one", "accessory to be equipped per set." }, new String[] { "!block", "all" });
}
@Override
public void whenApplied(ItemStackBuilder item, StatData data) {
item.addItemTag(new ItemTag(getNBTPath(), data.toString()));
}
@Override
public void whenInput(EditionInventory inv, String message, Object... info) {
message = message.toLowerCase();
inv.getEditedSection().set(getPath(), message);
inv.registerTemplateEdition();
inv.getPlayer().sendMessage(
MMOItems.plugin.getPrefix() + getName() + " successfully changed to " + MMOLib.plugin.parseColors(message) + ChatColor.GRAY + ".");
}
}

View File

@ -43,9 +43,9 @@ public class DisplayName extends StringStat {
} }
private String parse() { private String parse() {
name = name.replace("<tier-name>", (mmoitem.hasData(ItemStat.TIER)) name = name.replace("<tier-name>", (mmoitem.hasData(ItemStat.TIER) && MMOItems.plugin.getTiers().findTier(mmoitem) != null)
? stripColorCodes(MMOItems.plugin.getTiers().findTier(mmoitem).getName()) : ""); ? stripColorCodes(MMOItems.plugin.getTiers().findTier(mmoitem).getName()) : "");
name = name.replace("<tier-color>", (mmoitem.hasData(ItemStat.TIER)) name = name.replace("<tier-color>", (mmoitem.hasData(ItemStat.TIER) && MMOItems.plugin.getTiers().findTier(mmoitem) != null)
? stripText(MMOItems.plugin.getTiers().findTier(mmoitem).getName()) : "&f"); ? stripText(MMOItems.plugin.getTiers().findTier(mmoitem).getName()) : "&f");
name = name.replace("<type-name>", (mmoitem.hasData(ItemStat.DISPLAYED_TYPE)) name = name.replace("<type-name>", (mmoitem.hasData(ItemStat.DISPLAYED_TYPE))
? stripColorCodes(mmoitem.getData(ItemStat.DISPLAYED_TYPE).toString()) : stripColorCodes(mmoitem.getType().getName())); ? stripColorCodes(mmoitem.getData(ItemStat.DISPLAYED_TYPE).toString()) : stripColorCodes(mmoitem.getType().getName()));