Revert "Revert "Revert "Update JEMI integration"""

This reverts commit 962ae26.
emilyploszaj · Oct 7, 2024 · a74229c · a74229c
1 parent 6874eb9
commit a74229c
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 14 deletions.
diff --git a/xplat/src/main/java/dev/emi/emi/jemi/impl/JemiIngredientAcceptor.java b/xplat/src/main/java/dev/emi/emi/jemi/impl/JemiIngredientAcceptor.java
@@ -12,7 +12,6 @@
 import dev.emi.emi.EmiPort;
 import dev.emi.emi.api.stack.EmiIngredient;
 import dev.emi.emi.api.stack.EmiStack;
-import dev.emi.emi.config.FluidUnit;
 import dev.emi.emi.jemi.JemiStack;
 import dev.emi.emi.jemi.JemiUtil;
 import dev.emi.emi.jemi.impl.JemiRecipeSlot.IngredientRenderer;

diff --git a/xplat/src/main/java/dev/emi/emi/jemi/impl/JemiRecipeLayoutBuilder.java b/xplat/src/main/java/dev/emi/emi/jemi/impl/JemiRecipeLayoutBuilder.java
@@ -14,7 +14,6 @@ public class JemiRecipeLayoutBuilder implements IRecipeLayoutBuilder {
 	public final List<JemiRecipeSlotBuilder> slots = Lists.newArrayList();
 	public boolean shapeless = false;
 
-
 	@Override
 	public IRecipeSlotBuilder addSlot(RecipeIngredientRole recipeIngredientRole, int x, int y) {
 		JemiRecipeSlotBuilder builder = new JemiRecipeSlotBuilder(recipeIngredientRole, x, y);

diff --git a/xplat/src/main/java/dev/emi/emi/jemi/impl/JemiRecipeSlot.java b/xplat/src/main/java/dev/emi/emi/jemi/impl/JemiRecipeSlot.java
@@ -1,13 +1,9 @@
 package dev.emi.emi.jemi.impl;
 
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.Unmodifiable;
-
 import dev.emi.emi.api.stack.EmiIngredient;
 import dev.emi.emi.api.stack.EmiStack;
 import dev.emi.emi.api.widget.SlotWidget;
@@ -24,7 +20,6 @@
 @SuppressWarnings("unchecked")
 public class JemiRecipeSlot implements IRecipeSlotView {
 	public final RecipeIngredientRole role;
-	public final boolean large;
 	public final int x, y;
 	public final Optional<String> name;
 	public final IRecipeSlotTooltipCallback tooltipCallback;
@@ -37,7 +32,6 @@ public class JemiRecipeSlot implements IRecipeSlotView {
 
 	public JemiRecipeSlot(JemiRecipeSlotBuilder builder) {
 		this.role = builder.acceptor.role;
-		this.large = builder.large;
 		this.x = builder.x;
 		this.y = builder.y;
 		this.name = builder.name;
@@ -51,7 +45,6 @@ public JemiRecipeSlot(JemiRecipeSlotBuilder builder) {
 
 	public JemiRecipeSlot(RecipeIngredientRole role, EmiStack stack) {
 		this.role = role;
-		this.large = false;
 		this.x = 0;
 		this.y = 0;
 		this.name = Optional.empty();

diff --git a/xplat/src/main/java/dev/emi/emi/jemi/impl/JemiRecipeSlotBuilder.java b/xplat/src/main/java/dev/emi/emi/jemi/impl/JemiRecipeSlotBuilder.java
@@ -22,8 +22,7 @@
 
 public class JemiRecipeSlotBuilder implements IRecipeSlotBuilder {
 	public final JemiIngredientAcceptor acceptor;
-	public boolean large = false;
-	public int x, y;
+	public final int x, y;
 	public Optional<String> name = Optional.empty();
 	public IRecipeSlotTooltipCallback tooltipCallback;
 	public OffsetDrawable background, overlay;

diff --git a/xplat/src/main/java/dev/emi/emi/jemi/widget/JemiSlotWidget.java b/xplat/src/main/java/dev/emi/emi/jemi/widget/JemiSlotWidget.java
@@ -28,7 +28,7 @@ public class JemiSlotWidget extends SlotWidget {
 	private final JemiRecipeSlot slot;
 
 	public JemiSlotWidget(JemiRecipeSlot slot, EmiRecipe recipe) {
-		super(slot.stack, slot.x - (slot.large ? 6 : 1) , slot.y - (slot.large ? 6 : 1));
+		super(slot.stack, slot.x - 1, slot.y - 1);
 		this.slot = slot;
 		slot.widget = this;
 		if (slot.getRole() == RecipeIngredientRole.OUTPUT) {
@@ -38,8 +38,6 @@ public JemiSlotWidget(JemiRecipeSlot slot, EmiRecipe recipe) {
 		IIngredientRenderer<?> renderer = getRenderer();
 		if (renderer != null) {
 			this.customBackground(null, 0, 0, renderer.getWidth() + 2, renderer.getHeight() + 2);
-		} else if (slot.large) {
-			this.large(true);
 		}
 	}