From 660fe93297561280d9426c52dfdf192edf515583 Mon Sep 17 00:00:00 2001 From: YuRaNnNzZZ Date: Fri, 9 Jun 2023 12:26:24 +0300 Subject: [PATCH] update JEI plugin + added back to runtime --- build.gradle.kts | 2 +- .../otm/compat/jei/PlatePressRecipeCategory.kt | 18 +++++++++--------- .../mc/otm/compat/jei/SkinDrawable.kt | 6 +++--- .../mc/otm/compat/jei/StretchingDrawable.kt | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2076e4873..7eef78589 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -188,7 +188,7 @@ dependencies { compileOnly(fg.deobf("mezz.jei:jei-${jei_mc_version}-common-api:${jei_version}")) compileOnly(fg.deobf("mezz.jei:jei-${jei_mc_version}-forge-api:${jei_version}")) - //runtimeOnly(fg.deobf("mezz.jei:jei-${jei_mc_version}-forge:${jei_version}")) + runtimeOnly(fg.deobf("mezz.jei:jei-${jei_mc_version}-forge:${jei_version}")) //runtimeOnly(fg.deobf("curse.maven:jade-324717:${jade_id}")) //runtimeOnly(fg.deobf("curse.maven:configured-457570:${configured_id}")) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/PlatePressRecipeCategory.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/PlatePressRecipeCategory.kt index 61e9cb38c..2e46da76f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/PlatePressRecipeCategory.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/PlatePressRecipeCategory.kt @@ -1,6 +1,5 @@ package ru.dbotthepony.mc.otm.compat.jei -import com.mojang.blaze3d.vertex.PoseStack import mezz.jei.api.gui.builder.IRecipeLayoutBuilder import mezz.jei.api.gui.drawable.IDrawable import mezz.jei.api.gui.ingredient.IRecipeSlotsView @@ -8,6 +7,7 @@ import mezz.jei.api.recipe.IFocusGroup import mezz.jei.api.recipe.RecipeIngredientRole import mezz.jei.api.recipe.RecipeType import mezz.jei.api.recipe.category.IRecipeCategory +import net.minecraft.client.gui.GuiGraphics import net.minecraft.network.chat.Component import net.minecraft.resources.ResourceLocation import net.minecraft.world.item.ItemStack @@ -45,19 +45,19 @@ object PlatePressRecipeCategory : IRecipeCategory, IDrawable { return MItems.PLATE_PRESS.description } - override fun draw(poseStack: PoseStack, xOffset: Int, yOffset: Int) { + override fun draw(graphics: GuiGraphics, xOffset: Int, yOffset: Int) { @Suppress("name_shadowing") val xOffset = xOffset.toFloat() @Suppress("name_shadowing") val yOffset = yOffset.toFloat() - AbstractSlotPanel.SLOT_BACKGROUND.render(poseStack, X_INPUT + xOffset, Y_INPUT + yOffset) - AbstractSlotPanel.SLOT_BACKGROUND.render(poseStack, X_OUTPUT + xOffset, Y_OUTPUT + yOffset) - ProgressGaugePanel.GAUGE_BACKGROUND.render(poseStack, X_ARROW + xOffset, Y_ARROW + yOffset) + AbstractSlotPanel.SLOT_BACKGROUND.render(graphics, X_INPUT + xOffset, Y_INPUT + yOffset) + AbstractSlotPanel.SLOT_BACKGROUND.render(graphics, X_OUTPUT + xOffset, Y_OUTPUT + yOffset) + ProgressGaugePanel.GAUGE_BACKGROUND.render(graphics, X_ARROW + xOffset, Y_ARROW + yOffset) ProgressGaugePanel.GAUGE_FOREGROUND.renderPartial( - poseStack, + graphics, X_ARROW + xOffset, Y_ARROW + yOffset, width = (((System.currentTimeMillis() % 4000L) / 4000f) * ProgressGaugePanel.GAUGE_FOREGROUND.width).roundToInt().toFloat()) @@ -66,16 +66,16 @@ object PlatePressRecipeCategory : IRecipeCategory, IDrawable { override fun draw( recipe: PlatePressRecipe, recipeSlotsView: IRecipeSlotsView, - stack: PoseStack, + graphics: GuiGraphics, mouseX: Double, mouseY: Double ) { - minecraft.font.drawAligned(stack, TranslatableComponent("otm.gui.recipe.ticks", recipe.workTime), TextAlign.TOP_CENTER, 40f, 30f, RGBAColor.BLACK) + graphics.drawAligned(minecraft.font, TranslatableComponent("otm.gui.recipe.ticks", recipe.workTime), TextAlign.TOP_CENTER, 40f, 30f, RGBAColor.BLACK) val average = recipe.experience.toString() if (average != "0.0") { - minecraft.font.drawAligned(stack, TranslatableComponent("gui.jei.category.smelting.experience", average), TextAlign.TOP_CENTER, 40f, 1f, RGBAColor.BLACK) + graphics.drawAligned(minecraft.font, TranslatableComponent("gui.jei.category.smelting.experience", average), TextAlign.TOP_CENTER, 40f, 1f, RGBAColor.BLACK) } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/SkinDrawable.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/SkinDrawable.kt index b6d66e1f8..ff81b073e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/SkinDrawable.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/SkinDrawable.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.mc.otm.compat.jei -import com.mojang.blaze3d.vertex.PoseStack import mezz.jei.api.gui.drawable.IDrawable +import net.minecraft.client.gui.GuiGraphics import ru.dbotthepony.mc.otm.client.render.MatterySprite class SkinDrawable(val element: MatterySprite) : IDrawable { @@ -13,7 +13,7 @@ class SkinDrawable(val element: MatterySprite) : IDrawable { return element.height.toInt() } - override fun draw(poseStack: PoseStack, xOffset: Int, yOffset: Int) { - element.render(poseStack, xOffset.toFloat(), yOffset.toFloat()) + override fun draw(graphics: GuiGraphics, xOffset: Int, yOffset: Int) { + element.render(graphics, xOffset.toFloat(), yOffset.toFloat()) } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/StretchingDrawable.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/StretchingDrawable.kt index da3566a38..7d47e2454 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/StretchingDrawable.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/StretchingDrawable.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.mc.otm.compat.jei -import com.mojang.blaze3d.vertex.PoseStack import mezz.jei.api.gui.drawable.IDrawable +import net.minecraft.client.gui.GuiGraphics import ru.dbotthepony.mc.otm.client.render.StretchingRectangleElement class StretchingDrawable(val element: StretchingRectangleElement, val rectWidth: Int, val rectHeight: Int) : IDrawable { @@ -13,7 +13,7 @@ class StretchingDrawable(val element: StretchingRectangleElement, val rectWidth: return rectHeight } - override fun draw(poseStack: PoseStack, xOffset: Int, yOffset: Int) { - element.render(poseStack, xOffset.toFloat(), yOffset.toFloat(), rectWidth.toFloat(), rectHeight.toFloat()) + override fun draw(graphics: GuiGraphics, xOffset: Int, yOffset: Int) { + element.render(graphics, xOffset.toFloat(), yOffset.toFloat(), rectWidth.toFloat(), rectHeight.toFloat()) } }