From 30e91eec9b4826a592b750e9b8bcb3a85934c0cd Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 28 Jun 2020 20:31:33 -0500 Subject: [PATCH] Fix all redundant hardcoding of modid --- .../client/integration/jei/brewery/BreweryRecipeCategory.java | 2 +- .../integration/jei/elventrade/ElvenTradeRecipeCategory.java | 2 +- .../integration/jei/manapool/ManaPoolRecipeCategory.java | 2 +- .../integration/jei/orechid/OrechidRecipeCategoryBase.java | 3 ++- .../jei/petalapothecary/PetalApothecaryRecipeCategory.java | 2 +- .../integration/jei/puredaisy/PureDaisyRecipeCategory.java | 2 +- .../integration/jei/runicaltar/RunicAltarRecipeCategory.java | 2 +- src/main/java/vazkii/botania/common/lib/LibMisc.java | 4 +++- 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java index 77c9bacad..94b473053 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java @@ -44,7 +44,7 @@ public class BreweryRecipeCategory implements IRecipeCategory { private final String localizedName; public BreweryRecipeCategory(IGuiHelper guiHelper) { - ResourceLocation location = new ResourceLocation("botania", "textures/gui/nei_brewery.png"); + ResourceLocation location = new ResourceLocation(LibMisc.MOD_ID, "textures/gui/nei_brewery.png"); background = guiHelper.createDrawable(location, 0, 0, 166, 65); localizedName = I18n.format("botania.nei.brewery"); icon = guiHelper.createDrawableIngredient(new ItemStack(ModBlocks.brewery)); diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java index aaec2ff5d..28ae5f82d 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java @@ -56,7 +56,7 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory private final ItemStack inputStack; public OrechidRecipeCategoryBase(IGuiHelper guiHelper, ItemStack iconStack, ItemStack inputStack, String localizedName) { - overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pure_daisy_overlay.png"), + overlay = guiHelper.createDrawable(new ResourceLocation(LibMisc.MOD_ID, "textures/gui/pure_daisy_overlay.png"), 0, 0, 64, 46); background = guiHelper.createBlankDrawable(168, 64); this.localizedName = localizedName; diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java index c594aa90a..1b270d61f 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -47,7 +47,7 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory