diff --git a/src/main/java/mods/railcraft/integrations/emi/BlastFurnaceEmiRecipe.java b/src/main/java/mods/railcraft/integrations/emi/BlastFurnaceEmiRecipe.java index b693c7b5d..39e966756 100644 --- a/src/main/java/mods/railcraft/integrations/emi/BlastFurnaceEmiRecipe.java +++ b/src/main/java/mods/railcraft/integrations/emi/BlastFurnaceEmiRecipe.java @@ -7,21 +7,26 @@ import dev.emi.emi.api.stack.EmiIngredient; import dev.emi.emi.api.stack.EmiStack; import dev.emi.emi.api.widget.WidgetHolder; -import mods.railcraft.integrations.jei.category.BlastFurnaceRecipeCategory; +import mods.railcraft.api.core.RailcraftConstants; import mods.railcraft.world.item.RailcraftItems; import mods.railcraft.world.item.crafting.BlastFurnaceRecipe; import net.minecraft.SharedConstants; import net.minecraft.client.Minecraft; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; public class BlastFurnaceEmiRecipe extends BasicEmiRecipe { + private static final int WIDTH = 82; + private static final int HEIGHT = 54; + private static final ResourceLocation BACKGROUND = + RailcraftConstants.rl("textures/gui/container/blast_furnace.png"); + private final BlastFurnaceRecipe recipe; public BlastFurnaceEmiRecipe(BlastFurnaceRecipe recipe) { - super(RailcraftEmiPlugin.BLASTING_CATEGORY, recipe.getId(), - BlastFurnaceRecipeCategory.WIDTH, BlastFurnaceRecipeCategory.HEIGHT); + super(RailcraftEmiPlugin.BLASTING_CATEGORY, recipe.getId(), WIDTH, HEIGHT); this.recipe = recipe; this.inputs.add(EmiIngredient.of(recipe.getIngredients().get(0))); var level = Minecraft.getInstance().level; @@ -34,8 +39,7 @@ public BlastFurnaceEmiRecipe(BlastFurnaceRecipe recipe) { @Override public void addWidgets(WidgetHolder widgets) { - widgets.addTexture(BlastFurnaceRecipeCategory.BACKGROUND, - 0, 0, width, height, 55, 16); + widgets.addTexture(BACKGROUND, 0, 0, width, height, 55, 16); widgets.addFillingArrow(24, 18, 10_000).tooltip((x, y) -> { int cookTime = recipe.getCookingTime(); if (cookTime > 0) { diff --git a/src/main/java/mods/railcraft/integrations/emi/CokeOvenEmiRecipe.java b/src/main/java/mods/railcraft/integrations/emi/CokeOvenEmiRecipe.java index 0293a0efc..5e41b8c32 100644 --- a/src/main/java/mods/railcraft/integrations/emi/CokeOvenEmiRecipe.java +++ b/src/main/java/mods/railcraft/integrations/emi/CokeOvenEmiRecipe.java @@ -8,19 +8,24 @@ import dev.emi.emi.api.stack.EmiIngredient; import dev.emi.emi.api.stack.EmiStack; import dev.emi.emi.api.widget.WidgetHolder; -import mods.railcraft.integrations.jei.category.CokeOvenRecipeCategory; +import mods.railcraft.api.core.RailcraftConstants; import mods.railcraft.world.item.crafting.CokeOvenRecipe; import net.minecraft.SharedConstants; import net.minecraft.client.Minecraft; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; public class CokeOvenEmiRecipe extends BasicEmiRecipe { + private static final int WIDTH = 124; + private static final int HEIGHT = 49; + private static final ResourceLocation BACKGROUND = + RailcraftConstants.rl("textures/gui/container/coke_oven.png"); + private final CokeOvenRecipe recipe; public CokeOvenEmiRecipe(CokeOvenRecipe recipe) { - super(RailcraftEmiPlugin.COKING_CATEGORY, recipe.getId(), - CokeOvenRecipeCategory.WIDTH, CokeOvenRecipeCategory.HEIGHT); + super(RailcraftEmiPlugin.COKING_CATEGORY, recipe.getId(), WIDTH, HEIGHT); this.recipe = recipe; this.inputs.add(EmiIngredient.of(recipe.getIngredients().get(0))); var level = Minecraft.getInstance().level; @@ -29,7 +34,7 @@ public CokeOvenEmiRecipe(CokeOvenRecipe recipe) { @Override public void addWidgets(WidgetHolder widgets) { - widgets.addTexture(CokeOvenRecipeCategory.BACKGROUND, 0, 0, width, height, 15, 23); + widgets.addTexture(BACKGROUND, 0, 0, width, height, 15, 23); widgets.addFillingArrow(18, 20, 10_000).tooltip((x, y) -> { int cookTime = recipe.getCookingTime(); if (cookTime > 0) { diff --git a/src/main/java/mods/railcraft/integrations/emi/CrusherEmiRecipe.java b/src/main/java/mods/railcraft/integrations/emi/CrusherEmiRecipe.java index 17befa1db..3de59679a 100644 --- a/src/main/java/mods/railcraft/integrations/emi/CrusherEmiRecipe.java +++ b/src/main/java/mods/railcraft/integrations/emi/CrusherEmiRecipe.java @@ -7,20 +7,25 @@ import dev.emi.emi.api.stack.EmiStack; import dev.emi.emi.api.widget.WidgetHolder; import mods.railcraft.Translations; -import mods.railcraft.integrations.jei.category.CrusherRecipeCategory; +import mods.railcraft.api.core.RailcraftConstants; import mods.railcraft.world.item.crafting.CrusherRecipe; import net.minecraft.ChatFormatting; import net.minecraft.SharedConstants; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; public class CrusherEmiRecipe extends BasicEmiRecipe { + private static final int WIDTH = 144; + private static final int HEIGHT = 54; + private static final ResourceLocation BACKGROUND = + RailcraftConstants.rl("textures/gui/container/crusher.png"); + private final CrusherRecipe recipe; public CrusherEmiRecipe(CrusherRecipe recipe) { - super(RailcraftEmiPlugin.CRUSHING_CATEGORY, recipe.getId(), - CrusherRecipeCategory.WIDTH, CrusherRecipeCategory.HEIGHT); + super(RailcraftEmiPlugin.CRUSHING_CATEGORY, recipe.getId(), WIDTH, HEIGHT); this.recipe = recipe; this.inputs.add(EmiIngredient.of(recipe.getIngredients().get(0))); this.recipe.getProbabilityOutputs().stream() @@ -31,9 +36,8 @@ public CrusherEmiRecipe(CrusherRecipe recipe) { @Override public void addWidgets(WidgetHolder widgets) { - widgets.addTexture(CrusherRecipeCategory.BACKGROUND, 0, 0, width, height, 0, 171); - var crushingTexture = new EmiTexture(CrusherRecipeCategory.BACKGROUND, - 144, 171, 29, 53); + widgets.addTexture(BACKGROUND, 0, 0, width, height, 0, 171); + var crushingTexture = new EmiTexture(BACKGROUND, 144, 171, 29, 53); widgets.addAnimatedTexture(crushingTexture, 58, 0, 1000 * this.recipe.getProcessTime() / SharedConstants.TICKS_PER_SECOND, true, false, false); diff --git a/src/main/java/mods/railcraft/integrations/jei/category/BlastFurnaceRecipeCategory.java b/src/main/java/mods/railcraft/integrations/jei/category/BlastFurnaceRecipeCategory.java index a46a17a69..57f4609b9 100644 --- a/src/main/java/mods/railcraft/integrations/jei/category/BlastFurnaceRecipeCategory.java +++ b/src/main/java/mods/railcraft/integrations/jei/category/BlastFurnaceRecipeCategory.java @@ -24,10 +24,10 @@ public class BlastFurnaceRecipeCategory implements IRecipeCategory { - public static final int WIDTH = 82; - public static final int HEIGHT = 54; + private static final int WIDTH = 82; + private static final int HEIGHT = 54; - public static final ResourceLocation BACKGROUND = + private static final ResourceLocation BACKGROUND = RailcraftConstants.rl("textures/gui/container/blast_furnace.png"); private final IDrawable background, icon, flame, arrow; diff --git a/src/main/java/mods/railcraft/integrations/jei/category/CokeOvenRecipeCategory.java b/src/main/java/mods/railcraft/integrations/jei/category/CokeOvenRecipeCategory.java index 7ee5b8d59..27952d23f 100644 --- a/src/main/java/mods/railcraft/integrations/jei/category/CokeOvenRecipeCategory.java +++ b/src/main/java/mods/railcraft/integrations/jei/category/CokeOvenRecipeCategory.java @@ -25,10 +25,10 @@ public class CokeOvenRecipeCategory implements IRecipeCategory { - public static final int WIDTH = 124; - public static final int HEIGHT = 49; + private static final int WIDTH = 124; + private static final int HEIGHT = 49; - public static final ResourceLocation BACKGROUND = + private static final ResourceLocation BACKGROUND = RailcraftConstants.rl("textures/gui/container/coke_oven.png"); private final IDrawable background, icon, flame, arrow; diff --git a/src/main/java/mods/railcraft/integrations/jei/category/CrusherRecipeCategory.java b/src/main/java/mods/railcraft/integrations/jei/category/CrusherRecipeCategory.java index aadd77286..887fdf663 100644 --- a/src/main/java/mods/railcraft/integrations/jei/category/CrusherRecipeCategory.java +++ b/src/main/java/mods/railcraft/integrations/jei/category/CrusherRecipeCategory.java @@ -22,10 +22,10 @@ public class CrusherRecipeCategory implements IRecipeCategory { - public static final int WIDTH = 144; - public static final int HEIGHT = 54; + private static final int WIDTH = 144; + private static final int HEIGHT = 54; - public static final ResourceLocation BACKGROUND = + private static final ResourceLocation BACKGROUND = RailcraftConstants.rl("textures/gui/container/crusher.png"); private final IDrawable background, icon, arrow; diff --git a/src/main/java/mods/railcraft/integrations/jei/category/FluidBoilerRecipeCategory.java b/src/main/java/mods/railcraft/integrations/jei/category/FluidBoilerRecipeCategory.java index 4d2ab766d..7758e939b 100644 --- a/src/main/java/mods/railcraft/integrations/jei/category/FluidBoilerRecipeCategory.java +++ b/src/main/java/mods/railcraft/integrations/jei/category/FluidBoilerRecipeCategory.java @@ -28,10 +28,10 @@ public class FluidBoilerRecipeCategory implements IRecipeCategory { - public static final int WIDTH = 117; - public static final int HEIGHT = 54; + private static final int WIDTH = 117; + private static final int HEIGHT = 54; - public static final ResourceLocation BACKGROUND = + private static final ResourceLocation BACKGROUND = RailcraftConstants.rl("textures/gui/container/fluid_fueled_steam_boiler.png"); private final IDrawable background, icon, flame, bar; diff --git a/src/main/java/mods/railcraft/integrations/jei/category/SolidBoilerRecipeCategory.java b/src/main/java/mods/railcraft/integrations/jei/category/SolidBoilerRecipeCategory.java index 71c068fa9..aa0876937 100644 --- a/src/main/java/mods/railcraft/integrations/jei/category/SolidBoilerRecipeCategory.java +++ b/src/main/java/mods/railcraft/integrations/jei/category/SolidBoilerRecipeCategory.java @@ -28,10 +28,10 @@ public class SolidBoilerRecipeCategory implements IRecipeCategory { - public static final int WIDTH = 117; - public static final int HEIGHT = 54; + private static final int WIDTH = 117; + private static final int HEIGHT = 54; - public static final ResourceLocation BACKGROUND = + private static final ResourceLocation BACKGROUND = RailcraftConstants.rl("textures/gui/container/solid_fueled_steam_boiler.png"); private final IDrawable background, icon, flame, bar;