From 42d6c4b59b31687a1575e73d67a24a0893aec733 Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 2 Dec 2015 16:28:07 -0800 Subject: [PATCH] Whoops, forgot EtherealSlates --- build.gradle | 2 +- src/main/java/WayofTime/bloodmagic/item/ItemSlate.java | 2 +- src/main/java/WayofTime/bloodmagic/registry/ModItems.java | 1 + src/main/resources/assets/bloodmagic/lang/en_US.lang | 1 + .../resources/assets/bloodmagic/models/item/ItemSlate4.json | 6 ++++++ 5 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/bloodmagic/models/item/ItemSlate4.json diff --git a/build.gradle b/build.gradle index daf74546..3cb6760d 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ repositories { } dependencies { - deobfCompile "mezz.jei:jei_1.8.8:2.1.2.10" + deobfCompile "mezz.jei:jei_1.8.8:2.1.2.11" } minecraft { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java b/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java index 6ec21e8f..2869b2ac 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java @@ -15,7 +15,7 @@ import java.util.List; public class ItemSlate extends Item { - public String[] names = { "blank", "reinforced", "imbued", "demonic" }; + public String[] names = { "blank", "reinforced", "imbued", "demonic", "ethereal" }; public ItemSlate() { super(); diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java b/src/main/java/WayofTime/bloodmagic/registry/ModItems.java index 8b1af2ac..718a943a 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModItems.java @@ -110,6 +110,7 @@ public class ModItems { renderHelper.itemRender(slate, 1); renderHelper.itemRender(slate, 2); renderHelper.itemRender(slate, 3); + renderHelper.itemRender(slate, 4); renderHelper.itemRender(inscriptionTool, 1); renderHelper.itemRender(inscriptionTool, 2); diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index cda38903..95b217f7 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -29,6 +29,7 @@ item.BloodMagic.slate.blank.name=Blank Slate item.BloodMagic.slate.reinforced.name=Reinforced Slate item.BloodMagic.slate.imbued.name=Imbued Slate item.BloodMagic.slate.demonic.name=Demonic Slate +item.BloodMagic.slate.ethereal.name=Ethereal Slate item.BloodMagic.focus.weak.name=Teleposition Focus item.BloodMagic.focus.enhanced.name=Enhanced Teleposition Focus diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemSlate4.json b/src/main/resources/assets/bloodmagic/models/item/ItemSlate4.json new file mode 100644 index 00000000..e8f9f9c7 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/ItemSlate4.json @@ -0,0 +1,6 @@ +{ + "parent":"bloodmagic:item/ItemModelBase", + "textures": { + "layer0":"bloodmagic:items/baseItem_ethereal_slate" + } +}