From 170bbf165e19c76a54bea25edcca4b5123b0d484 Mon Sep 17 00:00:00 2001
From: Vaern <masondrown@gmail.com>
Date: Fri, 23 Feb 2024 15:47:18 -0800
Subject: [PATCH] plop

---
 .../container/ContainerElectricFurnace.java   | 43 ++++++++++++-------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/hbm/inventory/container/ContainerElectricFurnace.java b/src/main/java/com/hbm/inventory/container/ContainerElectricFurnace.java
index 14e375c65..5056782e9 100644
--- a/src/main/java/com/hbm/inventory/container/ContainerElectricFurnace.java
+++ b/src/main/java/com/hbm/inventory/container/ContainerElectricFurnace.java
@@ -2,14 +2,18 @@ package com.hbm.inventory.container;
 
 import com.hbm.inventory.SlotSmelting;
 import com.hbm.inventory.SlotUpgrade;
+import com.hbm.items.ModItems;
+import com.hbm.items.machine.ItemMachineUpgrade;
 import com.hbm.tileentity.machine.TileEntityMachineElectricFurnace;
 
+import api.hbm.energy.IBatteryItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.ICrafting;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.FurnaceRecipes;
 
 public class ContainerElectricFurnace extends Container {
 
@@ -42,33 +46,42 @@ public class ContainerElectricFurnace extends Container {
 	}
 
 	@Override
-	public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) {
-		ItemStack var3 = null;
-		Slot var4 = (Slot) this.inventorySlots.get(par2);
+	public ItemStack transferStackInSlot(EntityPlayer player, int index) {
+		ItemStack rStack = null;
+		Slot slot = (Slot) this.inventorySlots.get(index);
 
-		if(var4 != null && var4.getHasStack()) {
-			ItemStack var5 = var4.getStack();
-			var3 = var5.copy();
+		if(slot != null && slot.getHasStack()) {
+			ItemStack stack = slot.getStack();
+			rStack = stack.copy();
 
-			if(par2 <= 2) {
-				if(!this.mergeItemStack(var5, 3, this.inventorySlots.size(), true)) {
+			if(index <= 3) {
+				if(!this.mergeItemStack(stack, 4, this.inventorySlots.size(), true)) {
 					return null;
 				}
 
-				var4.onSlotChange(var5, var3);
-			} else if(!this.mergeItemStack(var5, 1, 2, false)) {
-				if(!this.mergeItemStack(var5, 0, 1, false))
+				slot.onSlotChange(stack, rStack);
+			} else {
+				
+				if(rStack.getItem() instanceof IBatteryItem || rStack.getItem() == ModItems.battery_creative) {
+					if(!this.mergeItemStack(stack, 0, 1, false))
+						return null;
+					
+				} else if(rStack.getItem() instanceof ItemMachineUpgrade) {
+					if(!this.mergeItemStack(stack, 3, 4, false))
+						return null;
+					
+				} else if(!this.mergeItemStack(stack, 1, 2, false))
 					return null;
 			}
 
-			if(var5.stackSize == 0) {
-				var4.putStack((ItemStack) null);
+			if(stack.stackSize == 0) {
+				slot.putStack((ItemStack) null);
 			} else {
-				var4.onSlotChanged();
+				slot.onSlotChanged();
 			}
 		}
 
-		return var3;
+		return rStack;
 	}
 
 	@Override