From c80cc0101f0bbae28239c23ed8d514bee199e76a Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 11 Oct 2017 12:56:29 +0100 Subject: [PATCH] Allow changing of the power cost view in fusion reactor recipes. --- src/main/java/techreborn/compat/jei/RecipeUtil.java | 5 +++-- .../tiles/fusionReactor/TileFusionControlComputer.java | 1 + src/main/resources/assets/techreborn/lang/en_us.lang | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/techreborn/compat/jei/RecipeUtil.java b/src/main/java/techreborn/compat/jei/RecipeUtil.java index fb0f393a0..d06c92388 100644 --- a/src/main/java/techreborn/compat/jei/RecipeUtil.java +++ b/src/main/java/techreborn/compat/jei/RecipeUtil.java @@ -33,6 +33,7 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fluids.FluidStack; +import reborncore.common.powerSystem.PowerSystem; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -54,7 +55,7 @@ public class RecipeUtil { int lineSpacing = fontRenderer.FONT_HEIGHT + 1; NumberFormat formatter = NumberFormat.getInstance(); - String startCostEU = formatter.format(startCost); + String startCostEU = PowerSystem.getLocaliszedPower(startCost); String startCostString = I18n.translateToLocalFormatted("techreborn.jei.recipe.start.cost", startCostEU); fontRenderer.drawString(startCostString, x, y, color); y += lineSpacing; @@ -68,7 +69,7 @@ public class RecipeUtil { FontRenderer fontRenderer = minecraft.fontRenderer; int lineSpacing = fontRenderer.FONT_HEIGHT + 1; - String runningCostString = I18n.translateToLocalFormatted("techreborn.jei.recipe.running.cost", euPerTick); + String runningCostString = I18n.translateToLocalFormatted("techreborn.jei.recipe.running.cost",PowerSystem.getDisplayPower().abbreviation.toUpperCase(), PowerSystem.getLocaliszedPowerFormattedNoSuffix(euPerTick)); fontRenderer.drawString(runningCostString, x, y, color); y += lineSpacing; diff --git a/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java b/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java index 82a2d0289..6e6df25b6 100644 --- a/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java +++ b/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java @@ -219,6 +219,7 @@ public class TileFusionControlComputer extends TilePowerAcceptor implements IToo if (hasStartedCrafting && this.crafingTickTime < this.finalTickTime) { this.crafingTickTime++; // Power gen + if (this.currentRecipe.getEuTick() > 0) { // Waste power if it has no where to go this.addEnergy(this.currentRecipe.getEuTick()); diff --git a/src/main/resources/assets/techreborn/lang/en_us.lang b/src/main/resources/assets/techreborn/lang/en_us.lang index 189bb9e85..fc99548da 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.lang +++ b/src/main/resources/assets/techreborn/lang/en_us.lang @@ -674,8 +674,8 @@ keys.techreborn.category=TechReborn Category keys.techreborn.config=Config # JEI Integration -techreborn.jei.recipe.start.cost=Start: %sEU -techreborn.jei.recipe.running.cost=EU/t: %s +techreborn.jei.recipe.start.cost=Start: %s +techreborn.jei.recipe.running.cost=%s/t: %s techreborn.jei.recipe.processing.time.1=Time: %s ticks techreborn.jei.recipe.processing.time.2=(%s seconds) jei.techreborn.scrapbox.name=Opening Scrapboxes