diff --git a/build.gradle b/build.gradle index 8748ac6..0f8292f 100644 --- a/build.gradle +++ b/build.gradle @@ -67,11 +67,9 @@ dependencies { compile "mezz.jei:jei_${mcVersion}:4.14.4.251" compile "redstone-flux:RedstoneFlux-1.12:2.1.0.6:universal" - compile "cofhcore:CoFHCore-1.12.2:4.6.1.22:universal" + compile "cofh-core:CoFHCore-1.12.2:4.6.1.22:universal" compile "cofh-world:CoFHWorld-1.12.2:1.3.0.6:universal" compile "thermal-foundation:ThermalFoundation-1.12.2:2.6.1.22:universal" - - compile "thermal-foundation:ThermalFoundation-1.12.2:2.6.1.22:universal" } processResources { diff --git a/src/main/java/xt9/inworldcrafting/integrations/jei/BurnItemRecipeCategory.java b/src/main/java/xt9/inworldcrafting/integrations/jei/BurnItemRecipeCategory.java index 842d643..a80f595 100644 --- a/src/main/java/xt9/inworldcrafting/integrations/jei/BurnItemRecipeCategory.java +++ b/src/main/java/xt9/inworldcrafting/integrations/jei/BurnItemRecipeCategory.java @@ -8,6 +8,7 @@ import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; @@ -42,7 +43,7 @@ public String getUid() { @Override public String getTitle() { - return "Burning Items"; + return I18n.format(InWorldCrafting.MODID+".jei.burn_item.title"); } @Override diff --git a/src/main/java/xt9/inworldcrafting/integrations/jei/BurnItemRecipeWrapper.java b/src/main/java/xt9/inworldcrafting/integrations/jei/BurnItemRecipeWrapper.java index 6cca032..8cc46a5 100644 --- a/src/main/java/xt9/inworldcrafting/integrations/jei/BurnItemRecipeWrapper.java +++ b/src/main/java/xt9/inworldcrafting/integrations/jei/BurnItemRecipeWrapper.java @@ -5,8 +5,11 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextFormatting; +import xt9.inworldcrafting.InWorldCrafting; import xt9.inworldcrafting.common.recipe.BurnItemRecipe; import xt9.inworldcrafting.common.util.IngredientHelper; +import net.minecraft.client.resources.I18n; /** * Created by xt9 on 2019-01-20. @@ -27,6 +30,8 @@ public void getIngredients(IIngredients ingredients) { @Override public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { FontRenderer renderer = minecraft.fontRenderer; - renderer.drawStringWithShadow("Recipe time: " + recipe.getTicks() + " ticks", 1, 30, 0xFFFFFF); + renderer.drawStringWithShadow( + I18n.format(InWorldCrafting.MODID+".jei.burn_item.description", String.valueOf(recipe.getTicks())), + 1,30,0xFFFFFF); } } diff --git a/src/main/java/xt9/inworldcrafting/integrations/jei/ExplodeBlockRecipeCategory.java b/src/main/java/xt9/inworldcrafting/integrations/jei/ExplodeBlockRecipeCategory.java index 5514302..2101eaa 100644 --- a/src/main/java/xt9/inworldcrafting/integrations/jei/ExplodeBlockRecipeCategory.java +++ b/src/main/java/xt9/inworldcrafting/integrations/jei/ExplodeBlockRecipeCategory.java @@ -8,6 +8,7 @@ import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; @@ -42,7 +43,7 @@ public String getUid() { @Override public String getTitle() { - return "Exploding Blocks"; + return I18n.format(InWorldCrafting.MODID+".jei.explode_blocks.title"); } @Override diff --git a/src/main/java/xt9/inworldcrafting/integrations/jei/ExplodeBlockRecipeWrapper.java b/src/main/java/xt9/inworldcrafting/integrations/jei/ExplodeBlockRecipeWrapper.java index b547166..c7cb7e5 100644 --- a/src/main/java/xt9/inworldcrafting/integrations/jei/ExplodeBlockRecipeWrapper.java +++ b/src/main/java/xt9/inworldcrafting/integrations/jei/ExplodeBlockRecipeWrapper.java @@ -4,7 +4,9 @@ import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; +import xt9.inworldcrafting.InWorldCrafting; import xt9.inworldcrafting.common.recipe.ExplodeBlockRecipe; /** @@ -26,6 +28,6 @@ public void getIngredients(IIngredients ingredients) { @Override public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { FontRenderer renderer = minecraft.fontRenderer; - renderer.drawStringWithShadow("Success chance: " + recipe.getItemSpawnChance() + "%", 1, 30, 0xFFFFFF); + renderer.drawStringWithShadow(I18n.format(InWorldCrafting.MODID+".jei.explode_blocks.description", String.valueOf(recipe.getItemSpawnChance())), 1, 30, 0xFFFFFF); } } diff --git a/src/main/java/xt9/inworldcrafting/integrations/jei/ExplodeItemRecipeCategory.java b/src/main/java/xt9/inworldcrafting/integrations/jei/ExplodeItemRecipeCategory.java index 72f2dfe..d947e33 100644 --- a/src/main/java/xt9/inworldcrafting/integrations/jei/ExplodeItemRecipeCategory.java +++ b/src/main/java/xt9/inworldcrafting/integrations/jei/ExplodeItemRecipeCategory.java @@ -8,6 +8,7 @@ import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; @@ -42,7 +43,7 @@ public String getUid() { @Override public String getTitle() { - return "Exploding Items"; + return I18n.format(InWorldCrafting.MODID+".jei.explode_items.title"); } @Override diff --git a/src/main/java/xt9/inworldcrafting/integrations/jei/ExplodeItemRecipeWrapper.java b/src/main/java/xt9/inworldcrafting/integrations/jei/ExplodeItemRecipeWrapper.java index 328e4d1..6e186a5 100644 --- a/src/main/java/xt9/inworldcrafting/integrations/jei/ExplodeItemRecipeWrapper.java +++ b/src/main/java/xt9/inworldcrafting/integrations/jei/ExplodeItemRecipeWrapper.java @@ -4,7 +4,9 @@ import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; +import xt9.inworldcrafting.InWorldCrafting; import xt9.inworldcrafting.common.recipe.ExplodeItemRecipe; import xt9.inworldcrafting.common.util.IngredientHelper; @@ -27,6 +29,6 @@ public void getIngredients(IIngredients ingredients) { @Override public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { FontRenderer renderer = minecraft.fontRenderer; - renderer.drawStringWithShadow("Success chance: " + recipe.getSurviveChance() + "%", 1, 30, 0xFFFFFF); + renderer.drawStringWithShadow(I18n.format(InWorldCrafting.MODID+".jei.explode_items.description",String.valueOf(recipe.getSurviveChance())), 1, 30, 0xFFFFFF); } } diff --git a/src/main/java/xt9/inworldcrafting/integrations/jei/FluidToFluidRecipeCategory.java b/src/main/java/xt9/inworldcrafting/integrations/jei/FluidToFluidRecipeCategory.java index 1b1c185..d0da53c 100644 --- a/src/main/java/xt9/inworldcrafting/integrations/jei/FluidToFluidRecipeCategory.java +++ b/src/main/java/xt9/inworldcrafting/integrations/jei/FluidToFluidRecipeCategory.java @@ -8,6 +8,7 @@ import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; @@ -56,7 +57,7 @@ public String getUid() { @Override public String getTitle() { - return "Fluid to Fluid Transformation"; + return I18n.format(InWorldCrafting.MODID+".jei.fluid_to_fluid.title"); } @Override diff --git a/src/main/java/xt9/inworldcrafting/integrations/jei/FluidToFluidRecipeWrapper.java b/src/main/java/xt9/inworldcrafting/integrations/jei/FluidToFluidRecipeWrapper.java index 28d44ad..380d5bc 100644 --- a/src/main/java/xt9/inworldcrafting/integrations/jei/FluidToFluidRecipeWrapper.java +++ b/src/main/java/xt9/inworldcrafting/integrations/jei/FluidToFluidRecipeWrapper.java @@ -4,9 +4,11 @@ import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import xt9.inworldcrafting.InWorldCrafting; import xt9.inworldcrafting.common.recipe.FluidToFluidRecipe; import xt9.inworldcrafting.common.util.IngredientHelper; @@ -30,12 +32,12 @@ public void getIngredients(IIngredients ingredients) { @Override public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { FontRenderer renderer = minecraft.fontRenderer; - renderer.drawStringWithShadow("Consumes Item: ", 2, 26, 0xFFFFFF); + renderer.drawStringWithShadow(I18n.format(InWorldCrafting.MODID+".jei.if_consumes_item"), 2, 26, 0xFFFFFF); if(recipe.willConsume()) { - renderer.drawStringWithShadow("Yes", 80, 26, 0xcc0036); + renderer.drawStringWithShadow(I18n.format(InWorldCrafting.MODID+".jei.yes"), 80, 26, 0xcc0036); } else { - renderer.drawStringWithShadow("No", 80, 26, 0xc9f26a); + renderer.drawStringWithShadow(I18n.format(InWorldCrafting.MODID+".jei.no"), 80, 26, 0xc9f26a); } } } diff --git a/src/main/java/xt9/inworldcrafting/integrations/jei/FluidToItemRecipeCategory.java b/src/main/java/xt9/inworldcrafting/integrations/jei/FluidToItemRecipeCategory.java index 4267332..4eaaab9 100644 --- a/src/main/java/xt9/inworldcrafting/integrations/jei/FluidToItemRecipeCategory.java +++ b/src/main/java/xt9/inworldcrafting/integrations/jei/FluidToItemRecipeCategory.java @@ -8,6 +8,7 @@ import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; @@ -56,7 +57,7 @@ public String getUid() { @Override public String getTitle() { - return "Fluid to Item Transformation"; + return I18n.format(InWorldCrafting.MODID+".jei.fluid_to_item.title"); } @Override diff --git a/src/main/java/xt9/inworldcrafting/integrations/jei/FluidToItemRecipeWrapper.java b/src/main/java/xt9/inworldcrafting/integrations/jei/FluidToItemRecipeWrapper.java index c594f25..a629113 100644 --- a/src/main/java/xt9/inworldcrafting/integrations/jei/FluidToItemRecipeWrapper.java +++ b/src/main/java/xt9/inworldcrafting/integrations/jei/FluidToItemRecipeWrapper.java @@ -4,9 +4,11 @@ import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import xt9.inworldcrafting.InWorldCrafting; import xt9.inworldcrafting.common.recipe.FluidToItemRecipe; import xt9.inworldcrafting.common.util.IngredientHelper; @@ -30,12 +32,12 @@ public void getIngredients(IIngredients ingredients) { @Override public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { FontRenderer renderer = minecraft.fontRenderer; - renderer.drawStringWithShadow("Consumes Fluid: ", 2, 26, 0xFFFFFF); + renderer.drawStringWithShadow(I18n.format(InWorldCrafting.MODID+".jei.if_consumes_liquid"), 2, 26, 0xFFFFFF); if(recipe.willConsume()) { - renderer.drawStringWithShadow("Yes", 84, 26, 0xcc0036); + renderer.drawStringWithShadow(I18n.format(InWorldCrafting.MODID+".jei.yes"), 84, 26, 0xcc0036); } else { - renderer.drawStringWithShadow("No", 84, 26, 0xc9f26a); + renderer.drawStringWithShadow(I18n.format(InWorldCrafting.MODID+".jei.no"), 84, 26, 0xc9f26a); } } } diff --git a/src/main/resources/assets/inworldcrafting/lang/en_us.lang b/src/main/resources/assets/inworldcrafting/lang/en_us.lang new file mode 100644 index 0000000..9ce4dc4 --- /dev/null +++ b/src/main/resources/assets/inworldcrafting/lang/en_us.lang @@ -0,0 +1,12 @@ +inworldcrafting.jei.burn_item.description=Recipe Time: %s Ticks +inworldcrafting.jei.burn_item.title=Burning Recipe +inworldcrafting.jei.explode_blocks.title=Exploding Blocks +inworldcrafting.jei.explode_blocks.description=Success chance: %s %% +inworldcrafting.jei.explode_items.title=Exploding Items +inworldcrafting.jei.explode_items.description=Success chance: %s %% +inworldcrafting.jei.fluid_to_fluid.title=Fluid to Fluid Transformation +inworldcrafting.jei.fluid_to_item.title=Fluid to Item Transformation +inworldcrafting.jei.if_consumes_item=Consumes Item: +inworldcrafting.jei.if_consumes_liquid=Consumes Liquid: +inworldcrafting.jei.yes=Yes +inworldcrafting.jei.no=No \ No newline at end of file diff --git a/src/main/resources/assets/inworldcrafting/lang/zh_cn.lang b/src/main/resources/assets/inworldcrafting/lang/zh_cn.lang new file mode 100644 index 0000000..0995e05 --- /dev/null +++ b/src/main/resources/assets/inworldcrafting/lang/zh_cn.lang @@ -0,0 +1,12 @@ +inworldcrafting.jei.burn_item.description=燃烧时间: %s 游戏刻 +inworldcrafting.jei.burn_item.title=燃烧配方 +inworldcrafting.jei.explode_blocks.title=爆破方块 +inworldcrafting.jei.explode_blocks.description=成功率: %s %% +inworldcrafting.jei.explode_items.title=爆破物品 +inworldcrafting.jei.explode_items.description=成功率: %s %% +inworldcrafting.jei.fluid_to_fluid.title=流体-流体 转化配方 +inworldcrafting.jei.fluid_to_item.title=流体-物品 转换配方 +inworldcrafting.jei.if_consumes_item=是否消耗物品: +inworldcrafting.jei.if_consumes_liquid=是否消耗流体: +inworldcrafting.jei.yes=是 +inworldcrafting.jei.no=否 \ No newline at end of file