This commit is contained in:
2022-01-01 03:40:54 +01:00
parent 35c277ba3b
commit b36fdc2d67
20 changed files with 96 additions and 92 deletions

View File

@@ -11,7 +11,6 @@ import net.t2code.lib.Spigot.Lib.messages.send;
import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion;
import net.t2code.lib.Spigot.Lib.replace.Replace;
import org.bukkit.Material;
import org.bukkit.entity.Item;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
@@ -21,7 +20,6 @@ import java.lang.reflect.Field;
import java.util.UUID;
public class Give_UseItem {
private static String prefix = Util.Prefix;
public static void onGive(Player player) {
@@ -58,8 +56,8 @@ public class Give_UseItem {
playerheadmeta.setDisplayName(SelectConfig.UseItem_Name);
if (SelectConfig.UseItem_Base64_Enable) {
if (Main.PaPi) {
playerheadmeta.setLore(Replace.replace(prefix, player, SelectConfig.UseItem_Lore));
} else playerheadmeta.setLore(Replace.replace(prefix, SelectConfig.UseItem_Lore));
playerheadmeta.setLore(Replace.replace(Util.getPrefix(), player, SelectConfig.UseItem_Lore));
} else playerheadmeta.setLore(Replace.replace(Util.getPrefix(), SelectConfig.UseItem_Lore));
GameProfile profile = new GameProfile(UUID.randomUUID(), "");
profile.getProperties().put("textures", new Property("textures", SelectConfig.UseItem_Base64value));
Field profileField = null;
@@ -77,8 +75,8 @@ public class Give_UseItem {
} else p = SelectConfig.UseItem_PlayerName;
playerheadmeta.setOwner(p);
if (Main.PaPi) {
playerheadmeta.setLore(Replace.replace(prefix, player, SelectConfig.UseItem_Lore));
} else playerheadmeta.setLore(Replace.replace(prefix, SelectConfig.UseItem_Lore));
playerheadmeta.setLore(Replace.replace(Util.getPrefix(), player, SelectConfig.UseItem_Lore));
} else playerheadmeta.setLore(Replace.replace(Util.getPrefix(), SelectConfig.UseItem_Lore));
}
item.setItemMeta(playerheadmeta);
}
@@ -87,8 +85,8 @@ public class Give_UseItem {
ItemMeta itemMeta = item.getItemMeta();
itemMeta.setDisplayName(SelectConfig.UseItem_Name);
if (Main.PaPi) {
itemMeta.setLore(Replace.replace(prefix, player, SelectConfig.UseItem_Lore));
} else itemMeta.setLore(Replace.replace(prefix, SelectConfig.UseItem_Lore));
itemMeta.setLore(Replace.replace(Util.getPrefix(), player, SelectConfig.UseItem_Lore));
} else itemMeta.setLore(Replace.replace(Util.getPrefix(), SelectConfig.UseItem_Lore));
item.setItemMeta(itemMeta);
item.setAmount(1);
}

View File

@@ -5,6 +5,7 @@ package de.jatitv.commandguiv2.Spigot.system;
import de.jatitv.commandguiv2.Spigot.Main;
import de.jatitv.commandguiv2.Spigot.system.config.config.SelectConfig;
import de.jatitv.commandguiv2.Util;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
@@ -31,7 +32,7 @@ import java.util.zip.GZIPOutputStream;
public class Metrics {
public static void Bstats() {
int pluginId = Main.bstatsID; // <-- Replace with the id of your plugin!
int pluginId = Util.getBstatsID(); // <-- Replace with the id of your plugin!
Metrics metrics = new Metrics(Main.plugin, pluginId);
metrics.addCustomChart(new Metrics.SimplePie("updatecheckonjoin", () -> String.valueOf(SelectConfig.UpdateCheckOnJoin)));
metrics.addCustomChart(new Metrics.SimplePie("storage_type_mysql", () -> SelectConfig.Storage));

View File

@@ -1,7 +1,6 @@
package de.jatitv.commandguiv2.Spigot.system.config.config;
import de.jatitv.commandguiv2.Spigot.Main;
import de.jatitv.commandguiv2.Util;
import net.t2code.lib.Spigot.Lib.messages.send;
import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion;
import net.t2code.lib.Spigot.Lib.yamlConfiguration.Config;
@@ -15,8 +14,6 @@ import java.util.List;
public class ConfigCreate {
private static String prefix = Util.Prefix;
public static Integer ConfigVersion = 2;
private static Boolean UpdateCheckOnJoin = true;

View File

@@ -3,17 +3,17 @@ package de.jatitv.commandguiv2.Spigot.system.config.config;
import de.jatitv.commandguiv2.Spigot.Main;
import de.jatitv.commandguiv2.Spigot.system.config.languages.SelectMessages;
import de.jatitv.commandguiv2.Spigot.system.database.MySQL;
import de.jatitv.commandguiv2.Util;
import net.t2code.lib.Spigot.Lib.messages.send;
import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion;
import net.t2code.lib.Spigot.Lib.replace.Replace;
import net.t2code.lib.Util;
import org.bukkit.Sound;
import org.bukkit.configuration.file.YamlConfiguration;
import java.io.File;
import java.util.List;
public class SelectConfig {private static String prefix = Util.Prefix;
public class SelectConfig {
public static Boolean DisableUpdateChecker;
public static Boolean UpdateCheckOnJoin;
@@ -129,7 +129,7 @@ public class SelectConfig {private static String prefix = Util.Prefix;
UseItem_Base64value = yamlConfiguration.getString("UseItem.Item.PlayerHead.Base64.Base64Value");
UseItem_PlayerWhoHasOpenedTheGUI = yamlConfiguration.getBoolean("UseItem.Item.PlayerHead.PlayerWhoHasOpenedTheGUI");
UseItem_PlayerName = yamlConfiguration.getString("UseItem.Item.PlayerHead.PlayerName");
UseItem_Name = Replace.replace(prefix,yamlConfiguration.getString("UseItem.Item.Name"));
UseItem_Name = Replace.replace(Util.getPrefix(),yamlConfiguration.getString("UseItem.Item.Name"));
UseItem_Lore = yamlConfiguration.getList("UseItem.Item.Lore");
UseItem_GiveOnEveryJoin = yamlConfiguration.getBoolean("UseItem.Join.GiveOnEveryJoin");
UseItem_GiveOnlyOnFirstJoin = yamlConfiguration.getBoolean("UseItem.Join.GiveOnlyOnFirstJoin");

View File

@@ -10,7 +10,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
import java.io.File;
public class SelectMessages {
private static String prefix = Util.Prefix;
public static String selectMSG;
@@ -129,6 +129,6 @@ public class SelectMessages {
}
private static String select(String path, YamlConfiguration yamlConfiguration){
return Replace.replace(prefix,yamlConfiguration.getString(path));
return Replace.replace(Util.getPrefix(),yamlConfiguration.getString(path));
}
}