diff --git a/src/main/java/electroblob/wizardry/item/ItemSpectralDust.java b/src/main/java/electroblob/wizardry/item/ItemSpectralDust.java new file mode 100644 index 00000000..30b6504e --- /dev/null +++ b/src/main/java/electroblob/wizardry/item/ItemSpectralDust.java @@ -0,0 +1,39 @@ +package electroblob.wizardry.item; + +import electroblob.wizardry.Wizardry; +import electroblob.wizardry.constants.Element; +import electroblob.wizardry.registry.WizardryTabs; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; + +import java.util.Arrays; + +public class ItemSpectralDust extends Item implements IMultiTexturedItem { + + public ItemSpectralDust(){ + super(); + this.setHasSubtypes(true); + this.setMaxDamage(0); + this.setCreativeTab(WizardryTabs.WIZARDRY); + } + + @Override + public ResourceLocation getModelName(ItemStack stack){ + int metadata = stack.getMetadata(); + if(metadata >= Element.values().length) metadata = 0; + return new ResourceLocation(Wizardry.MODID, "spectral_dust_" + Element.values()[metadata].getName()); + } + + @Override + public void getSubItems(CreativeTabs tab, NonNullList items){ + if(tab == WizardryTabs.WIZARDRY){ + for(Element element : Arrays.copyOfRange(Element.values(), 1, Element.values().length)){ + items.add(new ItemStack(this, 1, element.ordinal())); + } + } + } + +} diff --git a/src/main/java/electroblob/wizardry/registry/WizardryItems.java b/src/main/java/electroblob/wizardry/registry/WizardryItems.java index e717d7f8..bc998db7 100644 --- a/src/main/java/electroblob/wizardry/registry/WizardryItems.java +++ b/src/main/java/electroblob/wizardry/registry/WizardryItems.java @@ -154,6 +154,8 @@ public final class WizardryItems { public static final Item smoke_bomb = placeholder(); public static final Item spark_bomb = placeholder(); + public static final Item spectral_dust = placeholder(); + public static final Item wizard_hat = placeholder(); public static final Item wizard_robe = placeholder(); public static final Item wizard_leggings = placeholder(); @@ -500,6 +502,8 @@ public final class WizardryItems { registerItem(registry, "smoke_bomb", new ItemSmokeBomb()); registerItem(registry, "spark_bomb", new ItemSparkBomb()); + registerItem(registry, "spectral_dust", new ItemSpectralDust()); + registerItem(registry, "wizard_hat", new ItemWizardArmour(Materials.SILK, 1, EntityEquipmentSlot.HEAD, null), true); registerItem(registry, "wizard_robe", new ItemWizardArmour(Materials.SILK, 1, EntityEquipmentSlot.CHEST, null)); registerItem(registry, "wizard_leggings", new ItemWizardArmour(Materials.SILK, 1, EntityEquipmentSlot.LEGS, null)); @@ -540,8 +544,8 @@ public final class WizardryItems { registerItem(registry, "wizard_leggings_healing", new ItemWizardArmour(Materials.SILK, 1, EntityEquipmentSlot.LEGS, Element.HEALING)); registerItem(registry, "wizard_boots_healing", new ItemWizardArmour(Materials.SILK, 1, EntityEquipmentSlot.FEET, Element.HEALING)); - registerItem(registry, "spectral_helmet", new ItemSpectralArmour(ArmorMaterial.IRON, 1, EntityEquipmentSlot.HEAD)); - registerItem(registry, "spectral_chestplate", new ItemSpectralArmour(ArmorMaterial.IRON, 1, EntityEquipmentSlot.CHEST)); + registerItem(registry, "spectral_helmet", new ItemSpectralArmour(ArmorMaterial.IRON, 1, EntityEquipmentSlot.HEAD)); + registerItem(registry, "spectral_chestplate", new ItemSpectralArmour(ArmorMaterial.IRON, 1, EntityEquipmentSlot.CHEST)); registerItem(registry, "spectral_leggings", new ItemSpectralArmour(ArmorMaterial.IRON, 1, EntityEquipmentSlot.LEGS)); registerItem(registry, "spectral_boots", new ItemSpectralArmour(ArmorMaterial.IRON, 1, EntityEquipmentSlot.FEET)); diff --git a/src/main/resources/assets/ebwizardry/lang/en_gb.lang b/src/main/resources/assets/ebwizardry/lang/en_gb.lang index ffc3116e..1cca607e 100644 --- a/src/main/resources/assets/ebwizardry/lang/en_gb.lang +++ b/src/main/resources/assets/ebwizardry/lang/en_gb.lang @@ -198,6 +198,8 @@ item.ebwizardry\:armour_upgrade.desc_extended=Apply this upgrade to a piece of w item.ebwizardry\:magic_silk.name=Magical Silk +item.ebwizardry\:spectral_dust.name=Spectral Dust + item.ebwizardry\:wizard_armour.legendary=Legendary item.ebwizardry\:wizard_armour.buff=-%1$s %2$s cost item.ebwizardry\:wizard_armour.mana=Mana\: %1$s/%2$s diff --git a/src/main/resources/assets/ebwizardry/lang/en_us.lang b/src/main/resources/assets/ebwizardry/lang/en_us.lang index 7b5d46f9..66fafa64 100644 --- a/src/main/resources/assets/ebwizardry/lang/en_us.lang +++ b/src/main/resources/assets/ebwizardry/lang/en_us.lang @@ -198,6 +198,8 @@ item.ebwizardry\:armour_upgrade.desc_extended=Apply this upgrade to a piece of w item.ebwizardry\:magic_silk.name=Magical Silk +item.ebwizardry\:spectral_dust.name=Spectral Dust + item.ebwizardry\:wizard_armour.legendary=Legendary item.ebwizardry\:wizard_armour.buff=-%1$s %2$s cost item.ebwizardry\:wizard_armour.mana=Mana\: %1$s/%2$s diff --git a/src/main/resources/assets/ebwizardry/models/item/spectral_dust_earth.json b/src/main/resources/assets/ebwizardry/models/item/spectral_dust_earth.json new file mode 100644 index 00000000..d22acbb9 --- /dev/null +++ b/src/main/resources/assets/ebwizardry/models/item/spectral_dust_earth.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ebwizardry:items/spectral_dust_earth" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/models/item/spectral_dust_fire.json b/src/main/resources/assets/ebwizardry/models/item/spectral_dust_fire.json new file mode 100644 index 00000000..7dbf7125 --- /dev/null +++ b/src/main/resources/assets/ebwizardry/models/item/spectral_dust_fire.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ebwizardry:items/spectral_dust_fire" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/models/item/spectral_dust_healing.json b/src/main/resources/assets/ebwizardry/models/item/spectral_dust_healing.json new file mode 100644 index 00000000..31fb5b3a --- /dev/null +++ b/src/main/resources/assets/ebwizardry/models/item/spectral_dust_healing.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ebwizardry:items/spectral_dust_healing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/models/item/spectral_dust_ice.json b/src/main/resources/assets/ebwizardry/models/item/spectral_dust_ice.json new file mode 100644 index 00000000..4a1bdfd8 --- /dev/null +++ b/src/main/resources/assets/ebwizardry/models/item/spectral_dust_ice.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ebwizardry:items/spectral_dust_ice" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/models/item/spectral_dust_lightning.json b/src/main/resources/assets/ebwizardry/models/item/spectral_dust_lightning.json new file mode 100644 index 00000000..26b8b830 --- /dev/null +++ b/src/main/resources/assets/ebwizardry/models/item/spectral_dust_lightning.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ebwizardry:items/spectral_dust_lightning" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/models/item/spectral_dust_necromancy.json b/src/main/resources/assets/ebwizardry/models/item/spectral_dust_necromancy.json new file mode 100644 index 00000000..d79c130e --- /dev/null +++ b/src/main/resources/assets/ebwizardry/models/item/spectral_dust_necromancy.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ebwizardry:items/spectral_dust_necromancy" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/models/item/spectral_dust_sorcery.json b/src/main/resources/assets/ebwizardry/models/item/spectral_dust_sorcery.json new file mode 100644 index 00000000..bf7f068b --- /dev/null +++ b/src/main/resources/assets/ebwizardry/models/item/spectral_dust_sorcery.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ebwizardry:items/spectral_dust_sorcery" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/textures/items/spectral_dust_earth.png b/src/main/resources/assets/ebwizardry/textures/items/spectral_dust_earth.png new file mode 100644 index 00000000..7b8fa46e Binary files /dev/null and b/src/main/resources/assets/ebwizardry/textures/items/spectral_dust_earth.png differ diff --git a/src/main/resources/assets/ebwizardry/textures/items/spectral_dust_fire.png b/src/main/resources/assets/ebwizardry/textures/items/spectral_dust_fire.png new file mode 100644 index 00000000..9e64160c Binary files /dev/null and b/src/main/resources/assets/ebwizardry/textures/items/spectral_dust_fire.png differ diff --git a/src/main/resources/assets/ebwizardry/textures/items/spectral_dust_healing.png b/src/main/resources/assets/ebwizardry/textures/items/spectral_dust_healing.png new file mode 100644 index 00000000..218e92df Binary files /dev/null and b/src/main/resources/assets/ebwizardry/textures/items/spectral_dust_healing.png differ diff --git a/src/main/resources/assets/ebwizardry/textures/items/spectral_dust_ice.png b/src/main/resources/assets/ebwizardry/textures/items/spectral_dust_ice.png new file mode 100644 index 00000000..73122cf1 Binary files /dev/null and b/src/main/resources/assets/ebwizardry/textures/items/spectral_dust_ice.png differ diff --git a/src/main/resources/assets/ebwizardry/textures/items/spectral_dust_lightning.png b/src/main/resources/assets/ebwizardry/textures/items/spectral_dust_lightning.png new file mode 100644 index 00000000..b8634fe6 Binary files /dev/null and b/src/main/resources/assets/ebwizardry/textures/items/spectral_dust_lightning.png differ diff --git a/src/main/resources/assets/ebwizardry/textures/items/spectral_dust_necromancy.png b/src/main/resources/assets/ebwizardry/textures/items/spectral_dust_necromancy.png new file mode 100644 index 00000000..afcbaf87 Binary files /dev/null and b/src/main/resources/assets/ebwizardry/textures/items/spectral_dust_necromancy.png differ diff --git a/src/main/resources/assets/ebwizardry/textures/items/spectral_dust_sorcery.png b/src/main/resources/assets/ebwizardry/textures/items/spectral_dust_sorcery.png new file mode 100644 index 00000000..666caa7c Binary files /dev/null and b/src/main/resources/assets/ebwizardry/textures/items/spectral_dust_sorcery.png differ