- Finalizes JEI compat fixes

Lothrazar · Apr 15, 2024 · 6c7c0ec · 6c7c0ec
1 parent 7d0525d
commit 6c7c0ec
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/src/main/java/com/lothrazar/cyclic/compat/jei/CrusherRecipeCategory.java b/src/main/java/com/lothrazar/cyclic/compat/jei/CrusherRecipeCategory.java
@@ -2,7 +2,11 @@
 
 import com.lothrazar.cyclic.ModCyclic;
 import com.lothrazar.cyclic.block.crusher.RecipeCrusher;
+import com.lothrazar.cyclic.block.solidifier.TileSolidifier;
 import com.lothrazar.cyclic.registry.BlockRegistry;
+import com.lothrazar.cyclic.registry.TextureRegistry;
+import com.lothrazar.library.gui.EnergyBar;
+import com.lothrazar.library.gui.TexturedProgress;
 import com.lothrazar.library.util.ChatUtil;
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
@@ -14,6 +18,7 @@
 import mezz.jei.api.recipe.RecipeType;
 import mezz.jei.api.recipe.category.IRecipeCategory;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
@@ -26,10 +31,17 @@ public class CrusherRecipeCategory implements IRecipeCategory<RecipeCrusher> {
   static final RecipeType<RecipeCrusher> TYPE = new RecipeType<>(ID, RecipeCrusher.class);
   private IDrawable gui;
   private IDrawable icon;
+  private Font font;
+  private EnergyBar bar;
 
   public CrusherRecipeCategory(IGuiHelper helper) {
+	font = Minecraft.getInstance().font;
     gui = helper.drawableBuilder(new ResourceLocation(ModCyclic.MODID, "textures/jei/crusher.png"), 0, 0, 155, 49).setTextureSize(155, 49).build();
     icon = helper.createDrawableIngredient(VanillaTypes.ITEM_STACK, new ItemStack(BlockRegistry.CRUSHER.get()));
+    bar = new EnergyBar(font, TileSolidifier.MAX);
+    bar.setHeight(48);
+    bar.guiLeft = -16;
+    bar.guiTop = -8;
   }
 
   @Override
@@ -55,7 +67,6 @@ public RecipeType<RecipeCrusher> getRecipeType() {
   @Override
   public void draw(RecipeCrusher recipe, IRecipeSlotsView recipeSlotsView, GuiGraphics ms, double mouseX, double mouseY) {
     int x = 78;
-    var font = Minecraft.getInstance().font;
     if (recipe.energy.getTicks() < 40) {
       ms.drawString(font, recipe.energy.getTicks() + " t", x, 6, FONT);
     }
@@ -68,6 +79,9 @@ public void draw(RecipeCrusher recipe, IRecipeSlotsView recipeSlotsView, GuiGrap
     if (!recipe.randOutput.bonus.isEmpty() && recipe.randOutput.percent > 0) {
       ms.drawString(font, recipe.randOutput.percent + "%", 56, 36, FONT);
     }
+
+    bar.draw(ms, recipe.energy.getEnergyTotal());
+    bar.renderHoveredToolTip(ms, (int) mouseX, (int) mouseY, recipe.energy.getEnergyTotal());
   }
 
   @Override

diff --git a/src/main/java/com/lothrazar/cyclic/compat/jei/MelterRecipeCategory.java b/src/main/java/com/lothrazar/cyclic/compat/jei/MelterRecipeCategory.java
@@ -44,6 +44,8 @@ public MelterRecipeCategory(IGuiHelper helper) {
     icon = helper.createDrawableIngredient(VanillaTypes.ITEM_STACK, new ItemStack(BlockRegistry.MELTER.get()));
     bar = new EnergyBar(font, TileSolidifier.MAX);
     progress = new TexturedProgress(font, 80, 19, 24, 17, TextureRegistry.ARROW);
+    bar.guiTop = -4;
+    bar.guiLeft = -2;
   }
 
   @Override
@@ -80,6 +82,6 @@ public void setRecipe(IRecipeLayoutBuilder builder, RecipeMelter recipe, IFocusG
     builder.addSlot(RecipeIngredientRole.INPUT, 4, 19).addIngredients(recipe.at(0));
     builder.addSlot(RecipeIngredientRole.INPUT, 22, 19).addIngredients(recipe.at(1));
     List<FluidStack> matchingFluids = List.of(recipe.getRecipeFluid());
-    builder.addSlot(RecipeIngredientRole.OUTPUT, 136, 19).addIngredients(ForgeTypes.FLUID_STACK, matchingFluids).setFluidRenderer(4000, false, 16, 16);
+    builder.addSlot(RecipeIngredientRole.OUTPUT, 132, 19).addIngredients(ForgeTypes.FLUID_STACK, matchingFluids).setFluidRenderer(4000, false, 16, 16);
   }
 }
diff --git a/src/main/java/com/lothrazar/cyclic/compat/jei/SolidifierRecipeCategory.java b/src/main/java/com/lothrazar/cyclic/compat/jei/SolidifierRecipeCategory.java
@@ -44,6 +44,8 @@ public SolidifierRecipeCategory(IGuiHelper helper) {
     icon = helper.createDrawableIngredient(VanillaTypes.ITEM_STACK, new ItemStack(BlockRegistry.SOLIDIFIER.get()));
     bar = new EnergyBar(font, TileSolidifier.MAX);
     progress = new TexturedProgress(font, 63, 25, 24, 17, TextureRegistry.ARROW);
+    bar.guiTop = -4;
+    bar.guiLeft = -2;
   }
 
   @Override