diff --git a/changelog.txt b/changelog.txt index 899850ba..7910c5e1 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,7 +1,13 @@ ------------------------------------------------------ -Version 2.0.1 +Version NEXT ------------------------------------------------------ - Added Life Essence bucket recipe +- Added the rendering of LP inside of the altar +- Added Living Armour including some upgrades: + - Added speed upgrade + - Added digging upgrade +- Modified Divination Sigil recipe - no longer uses a block of glass because of issues on servers (tempramental) + ------------------------------------------------------ Version 2.0.0 diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java b/src/main/java/WayofTime/bloodmagic/registry/ModItems.java index b36d74e8..b905a016 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModItems.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.registry; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -8,11 +9,44 @@ import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.orb.BloodOrb; import WayofTime.bloodmagic.api.registry.OrbRegistry; -import WayofTime.bloodmagic.item.*; +import WayofTime.bloodmagic.item.ItemActivationCrystal; +import WayofTime.bloodmagic.item.ItemAltarMaker; +import WayofTime.bloodmagic.item.ItemArcaneAshes; +import WayofTime.bloodmagic.item.ItemBloodOrb; +import WayofTime.bloodmagic.item.ItemBloodShard; +import WayofTime.bloodmagic.item.ItemBoundAxe; +import WayofTime.bloodmagic.item.ItemBoundPickaxe; +import WayofTime.bloodmagic.item.ItemBoundShovel; +import WayofTime.bloodmagic.item.ItemBoundSword; +import WayofTime.bloodmagic.item.ItemBucketEssence; +import WayofTime.bloodmagic.item.ItemComponent; +import WayofTime.bloodmagic.item.ItemDaggerOfSacrifice; +import WayofTime.bloodmagic.item.ItemInscriptionTool; +import WayofTime.bloodmagic.item.ItemLavaCrystal; +import WayofTime.bloodmagic.item.ItemRitualDiviner; +import WayofTime.bloodmagic.item.ItemSacrificialDagger; +import WayofTime.bloodmagic.item.ItemSlate; +import WayofTime.bloodmagic.item.ItemTelepositionFocus; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.item.gear.ItemPackSacrifice; import WayofTime.bloodmagic.item.gear.ItemPackSelfSacrifice; -import WayofTime.bloodmagic.item.sigil.*; +import WayofTime.bloodmagic.item.sigil.ItemSigilAir; +import WayofTime.bloodmagic.item.sigil.ItemSigilBloodLight; +import WayofTime.bloodmagic.item.sigil.ItemSigilCompression; +import WayofTime.bloodmagic.item.sigil.ItemSigilDivination; +import WayofTime.bloodmagic.item.sigil.ItemSigilElementalAffinity; +import WayofTime.bloodmagic.item.sigil.ItemSigilEnderSeverance; +import WayofTime.bloodmagic.item.sigil.ItemSigilFastMiner; +import WayofTime.bloodmagic.item.sigil.ItemSigilGreenGrove; +import WayofTime.bloodmagic.item.sigil.ItemSigilHaste; +import WayofTime.bloodmagic.item.sigil.ItemSigilLava; +import WayofTime.bloodmagic.item.sigil.ItemSigilMagnetism; +import WayofTime.bloodmagic.item.sigil.ItemSigilPhantomBridge; +import WayofTime.bloodmagic.item.sigil.ItemSigilSeer; +import WayofTime.bloodmagic.item.sigil.ItemSigilSuppression; +import WayofTime.bloodmagic.item.sigil.ItemSigilVoid; +import WayofTime.bloodmagic.item.sigil.ItemSigilWater; +import WayofTime.bloodmagic.item.sigil.ItemSigilWhirlwind; import WayofTime.bloodmagic.util.helper.InventoryRenderHelper; public class ModItems @@ -236,10 +270,10 @@ public class ModItems renderHelper.itemRender(bloodShard, 0); renderHelper.itemRender(bloodShard, 1); - renderHelper.itemRender(livingArmourHelmet); - renderHelper.itemRender(livingArmourChest); - renderHelper.itemRender(livingArmourLegs); - renderHelper.itemRender(livingArmourBoots); + renderHelper.itemRender(livingArmourHelmet, "ItemLivingArmour0"); + renderHelper.itemRender(livingArmourChest, "ItemLivingArmour1"); + renderHelper.itemRender(livingArmourLegs, "ItemLivingArmour2"); + renderHelper.itemRender(livingArmourBoots, "ItemLivingArmour3"); renderHelper.itemRender(altarMaker); diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index bbcc4b27..e64f41e2 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -99,6 +99,11 @@ item.BloodMagic.sigil.phantomBridge.name=Sigil of the Phantom Bridge item.BloodMagic.sigil.whirlwind.name=Sigil of the Whirlwind item.BloodMagic.sigil.enderSeverance.name=Sigil of Ender Severance +item.BloodMagic.livingArmour.helmet.name=Living Helmet +item.BloodMagic.livingArmour.chest.name=Living Chestplate +item.BloodMagic.livingArmour.legs.name=Living Leggings +item.BloodMagic.livingArmour.boots.name=Living Boots + item.BloodMagic.altarMaker.name=Altar Maker item.BloodMagic.ritualDivinernormal.name=Ritual Diviner diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour0.json b/src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour0.json new file mode 100644 index 00000000..907a2c9d --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour0.json @@ -0,0 +1,7 @@ +{ + "parent":"bloodmagic:item/ItemModelBase", + "textures": { + "layer0":"bloodmagic:items/LivingHelmet" + } +} + diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour1.json b/src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour1.json new file mode 100644 index 00000000..26e096b2 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour1.json @@ -0,0 +1,8 @@ +{ + "parent":"bloodmagic:item/ItemModelBase", + "textures": { + "layer0":"bloodmagic:items/LivingPlate" + } +} + + diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour2.json b/src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour2.json new file mode 100644 index 00000000..162ff0eb --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour2.json @@ -0,0 +1,7 @@ +{ + "parent":"bloodmagic:item/ItemModelBase", + "textures": { + "layer0":"bloodmagic:items/LivingLeggings" + } +} + diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour3.json b/src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour3.json new file mode 100644 index 00000000..6f2e8972 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/ItemLivingArmour3.json @@ -0,0 +1,7 @@ +{ + "parent":"bloodmagic:item/ItemModelBase", + "textures": { + "layer0":"bloodmagic:items/LivingBoots" + } +} + diff --git a/src/main/resources/assets/bloodmagic/textures/items/LivingBoots.png b/src/main/resources/assets/bloodmagic/textures/items/LivingBoots.png new file mode 100644 index 00000000..0c5e21e5 Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/items/LivingBoots.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/LivingHelmet.png b/src/main/resources/assets/bloodmagic/textures/items/LivingHelmet.png new file mode 100644 index 00000000..4b4b366d Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/items/LivingHelmet.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/LivingLeggings.png b/src/main/resources/assets/bloodmagic/textures/items/LivingLeggings.png new file mode 100644 index 00000000..9effc699 Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/items/LivingLeggings.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/LivingPlate.png b/src/main/resources/assets/bloodmagic/textures/items/LivingPlate.png new file mode 100644 index 00000000..49702f68 Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/items/LivingPlate.png differ