patch for material update

DenizenScript · Mar 6, 2019 · d1f2964 · d1f2964
1 parent f0c9595
commit d1f2964
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.../java/com/denizenscript/depenizen/bukkit/extensions/skillapi/SkillAPIPlayerExtension.java b/.../java/com/denizenscript/depenizen/bukkit/extensions/skillapi/SkillAPIPlayerExtension.java
@@ -6,12 +6,12 @@
 import com.sucy.skill.api.player.PlayerClass;
 import com.sucy.skill.api.player.PlayerData;
 import com.sucy.skill.api.player.PlayerSkill;
-import net.aufdemrand.denizen.objects.dMaterial;
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizencore.objects.Duration;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.tags.Attribute;
+import net.aufdemrand.denizen.utilities.blocks.OldMaterialsHelper;
 
 public class SkillAPIPlayerExtension extends dObjectExtension {
 
@@ -237,7 +237,7 @@ public String getAttribute(Attribute attribute) {
                 // @Plugin DepenizenBukkit, SkillAPI
                 // -->
                 if (attribute.startsWith("skill_bind")) {
-                    return dMaterial.getMaterialFrom(playerSkill.getBind()).getAttribute(attribute.fulfill(1));
+                    return OldMaterialsHelper.getMaterialFrom(playerSkill.getBind()).getAttribute(attribute.fulfill(1));
                 }
 
                 // <--[tag]

diff --git a/bukkit/src/main/java/com/denizenscript/depenizen/bukkit/objects/heroes/HeroesClass.java b/bukkit/src/main/java/com/denizenscript/depenizen/bukkit/objects/heroes/HeroesClass.java
@@ -3,7 +3,6 @@
 import com.denizenscript.depenizen.bukkit.support.Support;
 import com.herocraftonline.heroes.Heroes;
 import com.herocraftonline.heroes.characters.classes.HeroClass;
-import net.aufdemrand.denizen.objects.dMaterial;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.Fetchable;
 import net.aufdemrand.denizencore.objects.dList;
@@ -12,6 +11,7 @@
 import net.aufdemrand.denizencore.tags.TagContext;
 import com.denizenscript.depenizen.bukkit.support.plugins.HeroesSupport;
 import org.bukkit.Material;
+import net.aufdemrand.denizen.utilities.blocks.OldMaterialsHelper;
 
 import java.util.Set;
 
@@ -127,7 +127,7 @@ public String getAttribute(Attribute attribute) {
             Set<Material> allowed = heroClass.getAllowedArmor();
             dList list = new dList();
             for (Material armor : allowed) {
-                list.add(dMaterial.getMaterialFrom(armor).identify());
+                list.add(OldMaterialsHelper.getMaterialFrom(armor).identify());
             }
             return list.getAttribute(attribute.fulfill(1));
         }
@@ -143,7 +143,7 @@ public String getAttribute(Attribute attribute) {
             Set<Material> allowed = heroClass.getAllowedWeapons();
             dList list = new dList();
             for (Material armor : allowed) {
-                list.add(dMaterial.getMaterialFrom(armor).identify());
+                list.add(OldMaterialsHelper.getMaterialFrom(armor).identify());
             }
             return list.getAttribute(attribute.fulfill(1));
         }

diff --git a/...in/java/com/denizenscript/depenizen/bukkit/objects/prism/properties/PrismActionBlock.java b/...in/java/com/denizenscript/depenizen/bukkit/objects/prism/properties/PrismActionBlock.java
@@ -2,12 +2,12 @@
 
 import com.denizenscript.depenizen.bukkit.objects.prism.PrismAction;
 import me.botsko.prism.actions.Handler;
-import net.aufdemrand.denizen.objects.dMaterial;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.Mechanism;
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.objects.properties.Property;
 import net.aufdemrand.denizencore.tags.Attribute;
+import net.aufdemrand.denizen.utilities.blocks.OldMaterialsHelper;
 
 public class PrismActionBlock implements Property {
 
@@ -64,7 +64,7 @@ public String getAttribute(Attribute attribute) {
                 return null;
             }
             else {
-                return dMaterial.getMaterialFrom(dMaterial.getLegacyMaterial(id), subId > -1 ? subId : 0)
+                return OldMaterialsHelper.getMaterialFrom(OldMaterialsHelper.getLegacyMaterial(id), subId > -1 ? subId : 0)
                         .getAttribute(attribute.fulfill(1));
             }
         }
@@ -83,7 +83,7 @@ public String getAttribute(Attribute attribute) {
                 return null;
             }
             else {
-                return dMaterial.getMaterialFrom(dMaterial.getLegacyMaterial(id), subId > -1 ? subId : 0)
+                return OldMaterialsHelper.getMaterialFrom(OldMaterialsHelper.getLegacyMaterial(id), subId > -1 ? subId : 0)
                         .getAttribute(attribute.fulfill(1));
             }
         }