SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updates.. XMaterial added

Browse Source
This commit is contained in:
Driftay
2019-07-17 11:08:55 -04:00
parent 16cbee7050
commit 7233e8e819
18 changed files with 3048 additions and 2489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/massivecraft/factions/struct/Placeholder.java Normal file
View File

@@ -0,0 +1,23 @@
package com.massivecraft.factions.struct;
public class Placeholder {
private String tag;
private String replace;
public Placeholder(String tag, String replace) {
this.tag = tag;
this.replace = replace;
}
public String getReplace() {
return replace;
}
public String getTag() {
return tag;
}
}

4
src/main/java/com/massivecraft/factions/struct/Relation.java
View File

@@ -2,7 +2,7 @@ package com.massivecraft.factions.struct;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.util.MultiversionMaterials;
import com.massivecraft.factions.util.XMaterial;
import com.massivecraft.factions.zcore.fperms.Permissable;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.ChatColor;
@@ -204,7 +204,7 @@ public enum Relation implements Permissable {
String displayName = replacePlaceholders(RELATION_CONFIG.getString("placeholder-item.name", ""));
List<String> lore = new ArrayList<>();
Material material = MultiversionMaterials.fromString(RELATION_CONFIG.getString("materials." + name().toLowerCase())).parseMaterial();
Material material = XMaterial.matchXMaterial(RELATION_CONFIG.getString("materials." + name().toLowerCase())).parseMaterial();
if (material == null) {
return null;
}

4
src/main/java/com/massivecraft/factions/struct/Role.java
View File

@@ -2,7 +2,7 @@ package com.massivecraft.factions.struct;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.SaberFactions;
import com.massivecraft.factions.util.MultiversionMaterials;
import com.massivecraft.factions.util.XMaterial;
import com.massivecraft.factions.zcore.fperms.Permissable;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.ChatColor;
@@ -118,7 +118,7 @@ public enum Role implements Permissable {
String displayName = replacePlaceholders(RELATION_CONFIG.getString("placeholder-item.name", ""));
List<String> lore = new ArrayList<>();
Material material = MultiversionMaterials.fromString(RELATION_CONFIG.getString("materials." + name().toLowerCase(), "STAINED_CLAY")).parseMaterial();
Material material = XMaterial.matchXMaterial(RELATION_CONFIG.getString("materials." + name().toLowerCase(), "STAINED_CLAY")).parseMaterial();
if (material == null) {
return null;
}