From f0852a09cf5293bde2eae54bbf92aaac0f288be4 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Tue, 28 Aug 2018 16:43:37 +0300 Subject: [PATCH] Updated JEI createDrawable usage for fusion reactor. --- .../techreborn/compat/jei/RecipeUtil.java | 90 +++---------------- .../FusionReactorRecipeCategory.java | 19 ++-- .../FusionReactorRecipeWrapper.java | 2 +- .../assets/techreborn/lang/en_us.lang | 2 +- 4 files changed, 19 insertions(+), 94 deletions(-) diff --git a/src/main/java/techreborn/compat/jei/RecipeUtil.java b/src/main/java/techreborn/compat/jei/RecipeUtil.java index 4d6f382ad..350902c97 100644 --- a/src/main/java/techreborn/compat/jei/RecipeUtil.java +++ b/src/main/java/techreborn/compat/jei/RecipeUtil.java @@ -40,22 +40,18 @@ import javax.annotation.Nullable; import java.awt.*; import java.util.List; - public class RecipeUtil { private static final int color = Color.darkGray.getRGB(); private RecipeUtil() { } - public static void drawInfo( - @Nonnull - Minecraft minecraft, int x, int y, final double startCost, - final double euPerTick, final int tickTime) { + public static void drawInfo(@Nonnull Minecraft minecraft, int x, int y, double startCost, double euPerTick, + int tickTime) { FontRenderer fontRenderer = minecraft.fontRenderer; int lineSpacing = fontRenderer.FONT_HEIGHT + 1; String startCostEU = PowerSystem.getLocaliszedPower(startCost); - //String startCostString = I18n.translateToLocalFormatted("techreborn.jei.recipe.start.cost", startCostEU); String startCostString = StringUtils.t("techreborn.jei.recipe.start.cost", startCostEU); fontRenderer.drawString(startCostString, x, y, color); y += lineSpacing; @@ -63,92 +59,26 @@ public class RecipeUtil { drawInfo(minecraft, x, y, euPerTick, tickTime); } - public static void drawInfo( - @Nonnull - Minecraft minecraft, int x, int y, final double euPerTick, final int tickTime) { + public static void drawInfo(@Nonnull Minecraft minecraft, int x, int y, double euPerTick, int tickTime) { FontRenderer fontRenderer = minecraft.fontRenderer; int lineSpacing = fontRenderer.FONT_HEIGHT + 1; - String runningCostString = StringUtils.t("techreborn.jei.recipe.running.cost", PowerSystem.getDisplayPower().abbreviation.toUpperCase(), PowerSystem.getLocaliszedPowerFormattedNoSuffix(euPerTick)); - //String runningCostString = I18n.translateToLocalFormatted("techreborn.jei.recipe.running.cost",PowerSystem.getDisplayPower().abbreviation.toUpperCase(), PowerSystem.getLocaliszedPowerFormattedNoSuffix(euPerTick)); + String runningCostString = StringUtils.t("techreborn.jei.recipe.running.cost", + PowerSystem.getDisplayPower().abbreviation.toUpperCase(), + PowerSystem.getLocaliszedPowerFormattedNoSuffix(euPerTick)); fontRenderer.drawString(runningCostString, x, y, color); y += lineSpacing; - // String processingTimeString1 = I18n.translateToLocalFormatted("techreborn.jei.recipe.processing.time.1", tickTime); String processingTimeString1 = StringUtils.t("techreborn.jei.recipe.processing.time.1", tickTime); + String processingTimeString2 = StringUtils.t("techreborn.jei.recipe.processing.time.2", tickTime / 20); fontRenderer.drawString(processingTimeString1, x, y, color); y += lineSpacing; - - int seconds = tickTime / 20; - //String processingTimeString2 = I18n.translateToLocalFormatted("techreborn.jei.recipe.processing.time.2", seconds); - String processingTimeString2 = StringUtils.t("techreborn.jei.recipe.processing.time.2", seconds); fontRenderer.drawString(processingTimeString2, x + 10, y, color); } - @Deprecated - public static void setRecipeItems( - @Nonnull - IRecipeLayout recipeLayout, - @Nonnull - BaseRecipeWrapper recipe, - @Nullable - int[] itemInputSlots, - @Nullable - int[] itemOutputSlots, - @Nullable - int[] fluidInputSlots, - @Nullable - int[] fluidOutputSlots) { - IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); - IGuiFluidStackGroup guiFluidStacks = recipeLayout.getFluidStacks(); - - if (itemInputSlots != null) { - List> inputs = recipe.getInputs(); - for (int i = 0; i < inputs.size() && i < itemInputSlots.length; i++) { - int inputSlot = itemInputSlots[i]; - guiItemStacks.set(inputSlot, inputs.get(i)); - } - } - - if (itemOutputSlots != null) { - List outputs = recipe.getOutputs(); - for (int i = 0; i < outputs.size() && i < itemOutputSlots.length; i++) { - int outputSlot = itemOutputSlots[i]; - guiItemStacks.set(outputSlot, outputs.get(i)); - } - } - - if (fluidInputSlots != null) { - List fluidInputs = recipe.getFluidInputs(); - for (int i = 0; i < fluidInputs.size() && i < fluidInputSlots.length; i++) { - int inputTank = fluidInputSlots[i]; - guiFluidStacks.set(inputTank, fluidInputs.get(i)); - } - } - - //TODO 1.11 - // if (fluidOutputSlots != null) { - // List fluidOutputs = recipe.getFluidOutputs(); - // for (int i = 0; i < fluidOutputs.size() && i < fluidOutputSlots.length; i++) { - // int outputTank = fluidOutputSlots[i]; - // guiFluidStacks.set(outputTank, fluidOutputs.get(i)); - // } - // } - } - - public static void setRecipeItems( - @Nonnull - IRecipeLayout recipeLayout, - @Nonnull - IIngredients ingredients, - @Nullable - int[] itemInputSlots, - @Nullable - int[] itemOutputSlots, - @Nullable - int[] fluidInputSlots, - @Nullable - int[] fluidOutputSlots) { + public static void setRecipeItems(@Nonnull IRecipeLayout recipeLayout, @Nonnull IIngredients ingredients, + @Nullable int[] itemInputSlots, @Nullable int[] itemOutputSlots, @Nullable int[] fluidInputSlots, + @Nullable int[] fluidOutputSlots) { IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); IGuiFluidStackGroup guiFluidStacks = recipeLayout.getFluidStacks(); diff --git a/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java b/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java index 6604f11f7..6c5588aac 100644 --- a/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java @@ -39,7 +39,7 @@ import techreborn.lib.ModInfo; import javax.annotation.Nonnull; public class FusionReactorRecipeCategory implements IRecipeCategory { - + public static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/jei.png"); private static final int inputSlotTop = 0; private static final int inputSlotBottom = 1; @@ -51,7 +51,7 @@ public class FusionReactorRecipeCategory implements IRecipeCategory