lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fixed JEI localization (#1048)

Browse source
This commit is contained in:
Nicholas Ignoffo 2017-02-13 12:42:27 -08:00
parent 55949109e1
commit 2d02bcf37b
13 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java
View file

@ -57,8 +57,8 @@ public class BloodMagicPlugin extends BlankModPlugin
registry.addRecipes(AlchemyTableRecipeMaker.getRecipes());
registry.addRecipes(ArmourDowngradeRecipeMaker.getRecipes());
registry.addDescription(new ItemStack(ModItems.ALTAR_MAKER), "jei.bloodmagic.desc.altarBuilder");
registry.addDescription(new ItemStack(ModItems.MONSTER_SOUL), "jei.bloodmagic.desc.demonicWill");
registry.addDescription(new ItemStack(ModItems.ALTAR_MAKER), "jei.BloodMagic.desc.altarBuilder");
registry.addDescription(new ItemStack(ModItems.MONSTER_SOUL), "jei.BloodMagic.desc.demonicWill");
jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.BLOOD_LIGHT));
jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.SPECTRAL_BLOCK));

2
src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java
View file

@ -24,7 +24,7 @@ public class AlchemyArrayCraftingCategory implements IRecipeCategory
@Nonnull
private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/binding.png"), 0, 0, 100, 30);
@Nonnull
private final String localizedName = TextHelper.localize("jei.bloodmagic.recipe.alchemyArrayCrafting");
private final String localizedName = TextHelper.localize("jei.BloodMagic.recipe.alchemyArrayCrafting");
@Nonnull
@Override

2
src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java
View file

@ -27,7 +27,7 @@ public class AlchemyTableRecipeCategory implements IRecipeCategory
@Nonnull
private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/alchemyTable.png"), 0, 0, 118, 40);
@Nonnull
private final String localizedName = TextHelper.localize("jei.bloodmagic.recipe.alchemyTable");
private final String localizedName = TextHelper.localize("jei.BloodMagic.recipe.alchemyTable");
@Nonnull
private final ICraftingGridHelper craftingGridHelper;

4
src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java
View file

@ -34,8 +34,8 @@ public class AlchemyTableRecipeJEI extends BlankRecipeWrapper
ArrayList<String> ret = new ArrayList<String>();
if (mouseX >= 58 && mouseX <= 78 && mouseY >= 21 && mouseY <= 34)
{
ret.add(TextHelper.localize("jei.bloodmagic.recipe.lpDrained", recipe.getLpDrained()));
ret.add(TextHelper.localize("jei.bloodmagic.recipe.ticksRequired", recipe.getTicksRequired()));
ret.add(TextHelper.localize("jei.BloodMagic.recipe.lpDrained", recipe.getLpDrained()));
ret.add(TextHelper.localize("jei.BloodMagic.recipe.ticksRequired", recipe.getTicksRequired()));
}
return ret;
}

2
src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java
View file

@ -25,7 +25,7 @@ public class AltarRecipeCategory implements IRecipeCategory
@Nonnull
private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/altar.png"), 3, 4, 155, 65);
@Nonnull
private final String localizedName = TextHelper.localize("jei.bloodmagic.recipe.altar");
private final String localizedName = TextHelper.localize("jei.BloodMagic.recipe.altar");
@Nonnull
@Override

6
src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java
View file

@ -29,7 +29,7 @@ public class AltarRecipeJEI extends BlankRecipeWrapper
this.input = input;
this.output = output;
this.infoString = new String[] { TextHelper.localize("jei.bloodmagic.recipe.requiredTier", NumeralHelper.toRoman(tier)), TextHelper.localize("jei.bloodmagic.recipe.requiredLP", requiredLP) };
this.infoString = new String[] { TextHelper.localize("jei.BloodMagic.recipe.requiredTier", NumeralHelper.toRoman(tier)), TextHelper.localize("jei.BloodMagic.recipe.requiredLP", requiredLP) };
this.consumptionRate = consumptionRate;
this.drainRate = drainRate;
}
@ -46,8 +46,8 @@ public class AltarRecipeJEI extends BlankRecipeWrapper
ArrayList<String> ret = new ArrayList<String>();
if (mouseX >= 13 && mouseX <= 64 && mouseY >= 27 && mouseY <= 58)
{
ret.add(TextHelper.localize("jei.bloodmagic.recipe.consumptionRate", consumptionRate));
ret.add(TextHelper.localize("jei.bloodmagic.recipe.drainRate", drainRate));
ret.add(TextHelper.localize("jei.BloodMagic.recipe.consumptionRate", consumptionRate));
ret.add(TextHelper.localize("jei.BloodMagic.recipe.drainRate", drainRate));
}
return ret;
}

2
src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java
View file

@ -26,7 +26,7 @@ public class ArmourDowngradeRecipeCategory implements IRecipeCategory
@Nonnull
private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/alchemyTable.png"), 0, 0, 118, 40);
@Nonnull
private final String localizedName = TextHelper.localize("jei.bloodmagic.recipe.armourDowngrade");
private final String localizedName = TextHelper.localize("jei.BloodMagic.recipe.armourDowngrade");
@Nonnull
private final ICraftingGridHelper craftingGridHelper;

2
src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java
View file

@ -24,7 +24,7 @@ public class BindingRecipeCategory implements IRecipeCategory
@Nonnull
private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/binding.png"), 0, 0, 100, 30);
@Nonnull
private final String localizedName = TextHelper.localize("jei.bloodmagic.recipe.binding");
private final String localizedName = TextHelper.localize("jei.BloodMagic.recipe.binding");
@Nonnull
@Override

2
src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java
View file

@ -28,7 +28,7 @@ public class TartaricForgeRecipeCategory implements IRecipeCategory
@Nonnull
private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/soulForge.png"), 0, 0, 100, 40);
@Nonnull
private final String localizedName = TextHelper.localize("jei.bloodmagic.recipe.soulForge");
private final String localizedName = TextHelper.localize("jei.BloodMagic.recipe.soulForge");
@Nonnull
private final ICraftingGridHelper craftingGridHelper;

4
src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java
View file

@ -49,8 +49,8 @@ public class TartaricForgeRecipeJEI extends BlankRecipeWrapper
ArrayList<String> ret = new ArrayList<String>();
if (mouseX >= 40 && mouseX <= 60 && mouseY >= 21 && mouseY <= 34)
{
ret.add(TextHelper.localize("jei.bloodmagic.recipe.minimumSouls", recipe.getMinimumSouls()));
ret.add(TextHelper.localize("jei.bloodmagic.recipe.soulsDrained", recipe.getSoulsDrained()));
ret.add(TextHelper.localize("jei.BloodMagic.recipe.minimumSouls", recipe.getMinimumSouls()));
ret.add(TextHelper.localize("jei.BloodMagic.recipe.soulsDrained", recipe.getSoulsDrained()));
return ret;
}
return null;

2
src/main/java/WayofTime/bloodmagic/compat/jei/orb/ShapedOrbRecipeJEI.java
View file

@ -62,7 +62,7 @@ public class ShapedOrbRecipeJEI extends BlankRecipeWrapper implements IShapedCra
@Override
public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
String draw = TextHelper.localize("jei.bloodmagic.recipe.requiredTier", NumeralHelper.toRoman(tier));
String draw = TextHelper.localize("jei.BloodMagic.recipe.requiredTier", NumeralHelper.toRoman(tier));
minecraft.fontRendererObj.drawString(draw, 72 - minecraft.fontRendererObj.getStringWidth(draw) / 2, 10, Color.gray.getRGB());
}
}

2
src/main/java/WayofTime/bloodmagic/compat/jei/orb/ShapelessOrbRecipeJEI.java
View file

@ -52,7 +52,7 @@ public class ShapelessOrbRecipeJEI extends BlankRecipeWrapper implements ICrafti
@Override
public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY)
{
String draw = TextHelper.localize("jei.bloodmagic.recipe.requiredTier", NumeralHelper.toRoman(tier));
String draw = TextHelper.localize("jei.BloodMagic.recipe.requiredTier", NumeralHelper.toRoman(tier));
minecraft.fontRendererObj.drawString(draw, 72 - minecraft.fontRendererObj.getStringWidth(draw) / 2, 10, Color.gray.getRGB());
}
}

5
src/main/resources/assets/bloodmagic/lang/en_US.lang
View file

@ -780,11 +780,6 @@ chat.BloodMagic.mimic.potionSpawnRadius.down=Potion spawning radius has been dec
entity.BloodMagic.SentientSpecter.name=Sentient Specter
entity.BloodMagic.Mimic.name=Mimic
# sekrit
secret.BloodMagic.bread.bloody=&r&cBloody Bread
secret.BloodMagic.bread.bloody.desc=Only for &odire &r&7emergencies.
# Commands
commands.error.arg.invalid=Invalid arguments
commands.error.arg.missing=Not enough arguments