DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

update JEI plugin + added back to runtime

Browse Source
This commit is contained in:
YuRaNnNzZZ 2023-06-09 12:26:24 +03:00
parent b757d529d9
commit 660fe93297
Signed by: YuRaNnNzZZ
GPG Key ID: 5F71738C85A6006D
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -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}-common-api:${jei_version}"))
compileOnly(fg.deobf("mezz.jei:jei-${jei_mc_version}-forge-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:jade-324717:${jade_id}"))
//runtimeOnly(fg.deobf("curse.maven:configured-457570:${configured_id}")) //runtimeOnly(fg.deobf("curse.maven:configured-457570:${configured_id}"))

18
src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/PlatePressRecipeCategory.kt
View File

@ -1,6 +1,5 @@
package ru.dbotthepony.mc.otm.compat.jei 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.builder.IRecipeLayoutBuilder
import mezz.jei.api.gui.drawable.IDrawable import mezz.jei.api.gui.drawable.IDrawable
import mezz.jei.api.gui.ingredient.IRecipeSlotsView 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.RecipeIngredientRole
import mezz.jei.api.recipe.RecipeType import mezz.jei.api.recipe.RecipeType
import mezz.jei.api.recipe.category.IRecipeCategory import mezz.jei.api.recipe.category.IRecipeCategory
import net.minecraft.client.gui.GuiGraphics
import net.minecraft.network.chat.Component import net.minecraft.network.chat.Component
import net.minecraft.resources.ResourceLocation import net.minecraft.resources.ResourceLocation
import net.minecraft.world.item.ItemStack import net.minecraft.world.item.ItemStack
@ -45,19 +45,19 @@ object PlatePressRecipeCategory : IRecipeCategory<PlatePressRecipe>, IDrawable {
return MItems.PLATE_PRESS.description 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") @Suppress("name_shadowing")
val xOffset = xOffset.toFloat() val xOffset = xOffset.toFloat()
@Suppress("name_shadowing") @Suppress("name_shadowing")
val yOffset = yOffset.toFloat() val yOffset = yOffset.toFloat()
AbstractSlotPanel.SLOT_BACKGROUND.render(poseStack, X_INPUT + xOffset, Y_INPUT + yOffset) AbstractSlotPanel.SLOT_BACKGROUND.render(graphics, X_INPUT + xOffset, Y_INPUT + yOffset)
AbstractSlotPanel.SLOT_BACKGROUND.render(poseStack, X_OUTPUT + xOffset, Y_OUTPUT + yOffset) AbstractSlotPanel.SLOT_BACKGROUND.render(graphics, X_OUTPUT + xOffset, Y_OUTPUT + yOffset)
ProgressGaugePanel.GAUGE_BACKGROUND.render(poseStack, X_ARROW + xOffset, Y_ARROW + yOffset) ProgressGaugePanel.GAUGE_BACKGROUND.render(graphics, X_ARROW + xOffset, Y_ARROW + yOffset)
ProgressGaugePanel.GAUGE_FOREGROUND.renderPartial( ProgressGaugePanel.GAUGE_FOREGROUND.renderPartial(
poseStack, graphics,
X_ARROW + xOffset, X_ARROW + xOffset,
Y_ARROW + yOffset, Y_ARROW + yOffset,
width = (((System.currentTimeMillis() % 4000L) / 4000f) * ProgressGaugePanel.GAUGE_FOREGROUND.width).roundToInt().toFloat()) width = (((System.currentTimeMillis() % 4000L) / 4000f) * ProgressGaugePanel.GAUGE_FOREGROUND.width).roundToInt().toFloat())
@ -66,16 +66,16 @@ object PlatePressRecipeCategory : IRecipeCategory<PlatePressRecipe>, IDrawable {
override fun draw( override fun draw(
recipe: PlatePressRecipe, recipe: PlatePressRecipe,
recipeSlotsView: IRecipeSlotsView, recipeSlotsView: IRecipeSlotsView,
stack: PoseStack, graphics: GuiGraphics,
mouseX: Double, mouseX: Double,
mouseY: 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() val average = recipe.experience.toString()
if (average != "0.0") { 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)
} }
} }

6
src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/SkinDrawable.kt
View File

@ -1,7 +1,7 @@
package ru.dbotthepony.mc.otm.compat.jei package ru.dbotthepony.mc.otm.compat.jei
import com.mojang.blaze3d.vertex.PoseStack
import mezz.jei.api.gui.drawable.IDrawable import mezz.jei.api.gui.drawable.IDrawable
import net.minecraft.client.gui.GuiGraphics
import ru.dbotthepony.mc.otm.client.render.MatterySprite import ru.dbotthepony.mc.otm.client.render.MatterySprite
class SkinDrawable(val element: MatterySprite) : IDrawable { class SkinDrawable(val element: MatterySprite) : IDrawable {
@ -13,7 +13,7 @@ class SkinDrawable(val element: MatterySprite) : IDrawable {
return element.height.toInt() return element.height.toInt()
} }
override fun draw(poseStack: PoseStack, xOffset: Int, yOffset: Int) { override fun draw(graphics: GuiGraphics, xOffset: Int, yOffset: Int) {
element.render(poseStack, xOffset.toFloat(), yOffset.toFloat()) element.render(graphics, xOffset.toFloat(), yOffset.toFloat())
} }
} }

6
src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/StretchingDrawable.kt
View File

@ -1,7 +1,7 @@
package ru.dbotthepony.mc.otm.compat.jei package ru.dbotthepony.mc.otm.compat.jei
import com.mojang.blaze3d.vertex.PoseStack
import mezz.jei.api.gui.drawable.IDrawable import mezz.jei.api.gui.drawable.IDrawable
import net.minecraft.client.gui.GuiGraphics
import ru.dbotthepony.mc.otm.client.render.StretchingRectangleElement import ru.dbotthepony.mc.otm.client.render.StretchingRectangleElement
class StretchingDrawable(val element: StretchingRectangleElement, val rectWidth: Int, val rectHeight: Int) : IDrawable { 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 return rectHeight
} }
override fun draw(poseStack: PoseStack, xOffset: Int, yOffset: Int) { override fun draw(graphics: GuiGraphics, xOffset: Int, yOffset: Int) {
element.render(poseStack, xOffset.toFloat(), yOffset.toFloat(), rectWidth.toFloat(), rectHeight.toFloat()) element.render(graphics, xOffset.toFloat(), yOffset.toFloat(), rectWidth.toFloat(), rectHeight.toFloat())
} }
} }