diff --git a/build.gradle b/build.gradle index 0e9d6477c..c034b699e 100644 --- a/build.gradle +++ b/build.gradle @@ -102,10 +102,10 @@ dependencies { compileOnly fg.deobf("vazkii.patchouli:Patchouli:1.16-36.187:api") runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.16-36.187") + compileOnly fg.deobf("mezz.jei:jei-1.16.1:7.0.0.2:api") + runtimeOnly fg.deobf("mezz.jei:jei-1.16.1:7.0.0.2") + /* - compileOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.2:api") - runtimeOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.2") - compileOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.15.2-2.0:api") runtimeOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.15.2-2.0") */ diff --git a/src_disabled/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java similarity index 97% rename from src_disabled/jei/JEIBotaniaPlugin.java rename to src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index d129b2c57..9bed52abd 100644 --- a/src_disabled/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -28,6 +28,7 @@ import net.minecraft.tags.BlockTags; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.TranslationTextComponent; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.recipe.IElvenTradeRecipe; @@ -108,7 +109,7 @@ public class JEIBotaniaPlugin implements IModPlugin { } public static boolean doesOreExist(ResourceLocation tagId) { - return !BlockTags.getCollection().getOrCreate(tagId).getAllElements().isEmpty(); + return !BlockTags.getCollection().getOrCreate(tagId).func_230236_b_().isEmpty(); } @Override @@ -222,7 +223,7 @@ public class JEIBotaniaPlugin implements IModPlugin { group.addTooltipCallback((slotIndex, input, ingredient, tooltip) -> { if (slotIndex == slot) { if (Minecraft.getInstance().gameSettings.advancedItemTooltips || Screen.func_231173_s_()) { - tooltip.add(TextFormatting.DARK_GRAY + I18n.format("jei.tooltip.recipe.id", recipeId)); + tooltip.add(new TranslationTextComponent("jei.tooltip.recipe.id", recipeId).func_240699_a_(TextFormatting.DARK_GRAY)); } } }); diff --git a/src_disabled/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java similarity index 100% rename from src_disabled/jei/brewery/BreweryRecipeCategory.java rename to src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java diff --git a/src_disabled/jei/crafting/AncientWillRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/crafting/AncientWillRecipeWrapper.java similarity index 100% rename from src_disabled/jei/crafting/AncientWillRecipeWrapper.java rename to src/main/java/vazkii/botania/client/integration/jei/crafting/AncientWillRecipeWrapper.java diff --git a/src_disabled/jei/crafting/CompositeLensRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/crafting/CompositeLensRecipeWrapper.java similarity index 99% rename from src_disabled/jei/crafting/CompositeLensRecipeWrapper.java rename to src/main/java/vazkii/botania/client/integration/jei/crafting/CompositeLensRecipeWrapper.java index 544fa7115..42dc27ab1 100644 --- a/src_disabled/jei/crafting/CompositeLensRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/crafting/CompositeLensRecipeWrapper.java @@ -37,7 +37,7 @@ public class CompositeLensRecipeWrapper implements ICustomCraftingCategoryExtens public CompositeLensRecipeWrapper(CompositeLensRecipe recipe) { List lensStacks = ItemTags.getCollection().getOrCreate(new ResourceLocation(LibMisc.MOD_ID, "lens")) - .getAllElements().stream() + .func_230236_b_().stream() .map(ItemStack::new) .filter(s -> !((ItemLens) s.getItem()).isControlLens(s)) .filter(s -> ((ItemLens) s.getItem()).isCombinable(s)) diff --git a/src_disabled/jei/crafting/TerraPickTippingRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/crafting/TerraPickTippingRecipeWrapper.java similarity index 100% rename from src_disabled/jei/crafting/TerraPickTippingRecipeWrapper.java rename to src/main/java/vazkii/botania/client/integration/jei/crafting/TerraPickTippingRecipeWrapper.java diff --git a/src_disabled/jei/elventrade/ElvenTradeRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java similarity index 93% rename from src_disabled/jei/elventrade/ElvenTradeRecipeCategory.java rename to src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java index e8207aebc..e080080be 100644 --- a/src_disabled/jei/elventrade/ElvenTradeRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java @@ -9,6 +9,7 @@ package vazkii.botania.client.integration.jei.elventrade; import com.google.common.collect.ImmutableList; +import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; import mezz.jei.api.constants.VanillaTypes; @@ -31,6 +32,7 @@ import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.TranslationTextComponent; import org.lwjgl.opengl.GL11; import vazkii.botania.api.recipe.IElvenTradeRecipe; @@ -99,10 +101,10 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { if (slotIndex >= endIndex) { if (Minecraft.getInstance().gameSettings.advancedItemTooltips || Screen.func_231173_s_()) { - tooltip.add(TextFormatting.DARK_GRAY + I18n.format("jei.tooltip.recipe.id", recipeId)); + tooltip.add(new TranslationTextComponent("jei.tooltip.recipe.id", recipeId).func_240699_a_(TextFormatting.DARK_GRAY)); } } }); diff --git a/src_disabled/jei/manapool/ManaPoolRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java similarity index 96% rename from src_disabled/jei/manapool/ManaPoolRecipeCategory.java rename to src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java index f780423d1..66c201a41 100644 --- a/src_disabled/jei/manapool/ManaPoolRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java @@ -9,6 +9,7 @@ package vazkii.botania.client.integration.jei.manapool; import com.google.common.collect.ImmutableList; +import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; import mezz.jei.api.constants.VanillaTypes; @@ -103,10 +104,10 @@ public class ManaPoolRecipeCategory implements IRecipeCategory // Shouldn't ever return an empty list since the ore weight // list is filtered to only have ores with ItemBlocks List stackList = BlockTags.getCollection().getOrCreate(recipe.entry.getKey()) - .getAllElements() + .func_230236_b_() .stream() .filter(s -> s.asItem() != Items.AIR) .map(ItemStack::new) @@ -118,10 +119,10 @@ public abstract class OrechidRecipeCategoryBase } @Override - public void draw(T recipe, double mouseX, double mouseY) { + public void draw(T recipe, MatrixStack ms, double mouseX, double mouseY) { RenderSystem.enableAlphaTest(); RenderSystem.enableBlend(); - overlay.draw(48, 0); + overlay.draw(ms, 48, 0); RenderSystem.disableBlend(); RenderSystem.disableAlphaTest(); } diff --git a/src_disabled/jei/orechid/OrechidRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidRecipeWrapper.java similarity index 100% rename from src_disabled/jei/orechid/OrechidRecipeWrapper.java rename to src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidRecipeWrapper.java diff --git a/src_disabled/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java similarity index 96% rename from src_disabled/jei/petalapothecary/PetalApothecaryRecipeCategory.java rename to src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java index 7b473407a..c594aa90a 100644 --- a/src_disabled/jei/petalapothecary/PetalApothecaryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -8,6 +8,7 @@ */ package vazkii.botania.client.integration.jei.petalapothecary; +import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; import mezz.jei.api.constants.VanillaTypes; @@ -92,10 +93,10 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory