From fa030a1d43d62ffc8a6d89a6df1ad7ec3a0a1284 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 1 Jan 2016 18:54:58 -0800 Subject: [PATCH] Add an unlocalized name to Imperfect Rituals --- .../bloodmagic/api/ritual/imperfect/ImperfectRitual.java | 5 +++-- .../bloodmagic/ritual/imperfect/ImperfectRitualDay.java | 3 ++- .../bloodmagic/ritual/imperfect/ImperfectRitualNight.java | 3 ++- .../bloodmagic/ritual/imperfect/ImperfectRitualRain.java | 3 ++- .../ritual/imperfect/ImperfectRitualResistance.java | 3 ++- .../bloodmagic/ritual/imperfect/ImperfectRitualZombie.java | 3 ++- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/ImperfectRitual.java b/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/ImperfectRitual.java index d42973b7..f7cda233 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/ImperfectRitual.java +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/ImperfectRitual.java @@ -23,6 +23,7 @@ public abstract class ImperfectRitual private final BlockStack requiredBlock; private final int activationCost; private final boolean lightshow; + private final String unlocalizedName; /** * @param name @@ -32,9 +33,9 @@ public abstract class ImperfectRitual * @param activationCost * - Base LP cost for activating the ritual */ - public ImperfectRitual(String name, BlockStack requiredBlock, int activationCost) + public ImperfectRitual(String name, BlockStack requiredBlock, int activationCost, String unlocalizedName) { - this(name, requiredBlock, activationCost, false); + this(name, requiredBlock, activationCost, false, unlocalizedName); } /** diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java index 1cdbe477..6f3eea72 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.api.BlockStack; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; @@ -10,7 +11,7 @@ public class ImperfectRitualDay extends ImperfectRitual { public ImperfectRitualDay() { - super("day", new BlockStack(Blocks.gold_block), 5000, true); + super("day", new BlockStack(Blocks.gold_block), 5000, true, "ritual." + Constants.Mod.MODID + ".imperfect.day"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java index 901bca0c..508d21d3 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.api.BlockStack; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; @@ -10,7 +11,7 @@ public class ImperfectRitualNight extends ImperfectRitual { public ImperfectRitualNight() { - super("night", new BlockStack(Blocks.lapis_block), 100, true); + super("night", new BlockStack(Blocks.lapis_block), 100, true, "ritual." + Constants.Mod.MODID + ".imperfect.night"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java index f6226864..c666d178 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.api.BlockStack; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; @@ -10,7 +11,7 @@ public class ImperfectRitualRain extends ImperfectRitual { public ImperfectRitualRain() { - super("rain", new BlockStack(Blocks.water), 5000, true); + super("rain", new BlockStack(Blocks.water), 5000, true, "ritual." + Constants.Mod.MODID + ".imperfect.rain"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java index 8654366c..57ecb9a3 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.api.BlockStack; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; @@ -12,7 +13,7 @@ public class ImperfectRitualResistance extends ImperfectRitual { public ImperfectRitualResistance() { - super("resistance", new BlockStack(Blocks.bedrock), 5000); + super("resistance", new BlockStack(Blocks.bedrock), 5000, "ritual." + Constants.Mod.MODID + ".imperfect.resistance"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java index e796b6ee..b058e850 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.api.BlockStack; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.monster.EntityZombie; @@ -13,7 +14,7 @@ public class ImperfectRitualZombie extends ImperfectRitual { public ImperfectRitualZombie() { - super("zombie", new BlockStack(Blocks.coal_block), 5000); + super("zombie", new BlockStack(Blocks.coal_block), 5000, "ritual." + Constants.Mod.MODID + ".imperfect.zombie"); } @Override