xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1358 from Vaern/master

Browse Source 
Fixed Electric Furnace Shift-Clicking
This commit is contained in:
HbmMods 2024-02-25 11:46:54 +01:00 committed by GitHub
commit 5bfa4995c5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 132 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/com/hbm/inventory/container/ContainerCentrifuge.java
View File

@ -2,8 +2,11 @@ package com.hbm.inventory.container;
import com.hbm.inventory.SlotCraftingOutput; import com.hbm.inventory.SlotCraftingOutput;
import com.hbm.inventory.SlotUpgrade; import com.hbm.inventory.SlotUpgrade;
import com.hbm.items.ModItems;
import com.hbm.items.machine.ItemMachineUpgrade;
import com.hbm.tileentity.machine.TileEntityMachineCentrifuge; import com.hbm.tileentity.machine.TileEntityMachineCentrifuge;
import api.hbm.energy.IBatteryItem;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
@ -39,31 +42,43 @@ public class ContainerCentrifuge extends Container {
} }
@Override @Override
public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) { public ItemStack transferStackInSlot(EntityPlayer player, int index) {
ItemStack var3 = null; ItemStack rStack = null;
Slot var4 = (Slot) this.inventorySlots.get(par2); Slot slot = (Slot) this.inventorySlots.get(index);
if(var4 != null && var4.getHasStack()) { if(slot != null && slot.getHasStack()) {
ItemStack var5 = var4.getStack(); ItemStack stack = slot.getStack();
var3 = var5.copy(); rStack = stack.copy();
SlotCraftingOutput.checkAchievements(p_82846_1_, var5);
if(par2 <= 6) {
if(!this.mergeItemStack(var5, 6, this.inventorySlots.size(), true)) { if(index <= 7) {
if(!this.mergeItemStack(stack, 8, this.inventorySlots.size(), true)) {
return null; return null;
} }
} else if(!this.mergeItemStack(var5, 0, 2, false)) {
return null; slot.onSlotChange(stack, rStack);
} else {
if(rStack.getItem() instanceof IBatteryItem || rStack.getItem() == ModItems.battery_creative) {
if(!this.mergeItemStack(stack, 1, 2, false))
return null;
} else if(rStack.getItem() instanceof ItemMachineUpgrade) {
if(!this.mergeItemStack(stack, 6, 8, false))
return null;
} else if(!this.mergeItemStack(stack, 0, 1, false))
return null;
} }
if(var5.stackSize == 0) { if(stack.stackSize == 0) {
var4.putStack((ItemStack) null); slot.putStack((ItemStack) null);
} else { } else {
var4.onSlotChanged(); slot.onSlotChanged();
} }
} }
return var3; return rStack;
} }
@Override @Override

50
src/main/java/com/hbm/inventory/container/ContainerCrystallizer.java
View File

@ -2,7 +2,9 @@ package com.hbm.inventory.container;
import com.hbm.inventory.SlotCraftingOutput; import com.hbm.inventory.SlotCraftingOutput;
import com.hbm.inventory.SlotUpgrade; import com.hbm.inventory.SlotUpgrade;
import com.hbm.items.ModItems;
import com.hbm.items.machine.IItemFluidIdentifier; import com.hbm.items.machine.IItemFluidIdentifier;
import com.hbm.items.machine.ItemMachineUpgrade;
import com.hbm.tileentity.machine.TileEntityMachineCrystallizer; import com.hbm.tileentity.machine.TileEntityMachineCrystallizer;
import api.hbm.energy.IBatteryItem; import api.hbm.energy.IBatteryItem;
@ -46,44 +48,46 @@ public class ContainerCrystallizer extends Container {
} }
@Override @Override
public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) { public ItemStack transferStackInSlot(EntityPlayer player, int index) {
ItemStack var3 = null; ItemStack rStack = null;
Slot var4 = (Slot) this.inventorySlots.get(par2); Slot slot = (Slot) this.inventorySlots.get(index);
if(var4 != null && var4.getHasStack()) { if(slot != null && slot.getHasStack()) {
ItemStack var5 = var4.getStack(); ItemStack stack = slot.getStack();
var3 = var5.copy(); rStack = stack.copy();
SlotCraftingOutput.checkAchievements(p_82846_1_, var5); SlotCraftingOutput.checkAchievements(player, stack);
if(par2 <= diFurnace.getSizeInventory() - 1) { if(index <= 7) {
if(!this.mergeItemStack(var5, diFurnace.getSizeInventory(), this.inventorySlots.size(), true)) { if(!this.mergeItemStack(stack, 8, this.inventorySlots.size(), true)) {
return null; return null;
} }
} else { } else {
if(var3.getItem() instanceof IBatteryItem) { if(rStack.getItem() instanceof IBatteryItem || rStack.getItem() == ModItems.battery_creative) {
if(!this.mergeItemStack(var5, 1, 2, false)) { if(!this.mergeItemStack(stack, 1, 2, false))
return null; return null;
}
} else if(var3.getItem() instanceof IItemFluidIdentifier) { } else if(rStack.getItem() instanceof IItemFluidIdentifier) {
if(!this.mergeItemStack(var5, 7, 8, false)) { if(!this.mergeItemStack(stack, 7, 8, false))
return null; return null;
}
} else { } else if(rStack.getItem() instanceof ItemMachineUpgrade) {
if(!this.mergeItemStack(var5, 0, 1, false)) { if(!this.mergeItemStack(stack, 5, 7, false))
return null;
} else
if(!this.mergeItemStack(stack, 0, 1, false))
return null; return null;
}
}
} }
if(var5.stackSize == 0) { if(stack.stackSize == 0) {
var4.putStack((ItemStack) null); slot.putStack((ItemStack) null);
} else { } else {
var4.onSlotChanged(); slot.onSlotChanged();
} }
} }
return var3; return rStack;
} }
@Override @Override

42
src/main/java/com/hbm/inventory/container/ContainerElectricFurnace.java
View File

@ -2,8 +2,11 @@ package com.hbm.inventory.container;
import com.hbm.inventory.SlotSmelting; import com.hbm.inventory.SlotSmelting;
import com.hbm.inventory.SlotUpgrade; import com.hbm.inventory.SlotUpgrade;
import com.hbm.items.ModItems;
import com.hbm.items.machine.ItemMachineUpgrade;
import com.hbm.tileentity.machine.TileEntityMachineElectricFurnace; import com.hbm.tileentity.machine.TileEntityMachineElectricFurnace;
import api.hbm.energy.IBatteryItem;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
@ -42,33 +45,42 @@ public class ContainerElectricFurnace extends Container {
} }
@Override @Override
public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) { public ItemStack transferStackInSlot(EntityPlayer player, int index) {
ItemStack var3 = null; ItemStack rStack = null;
Slot var4 = (Slot) this.inventorySlots.get(par2); Slot slot = (Slot) this.inventorySlots.get(index);
if(var4 != null && var4.getHasStack()) { if(slot != null && slot.getHasStack()) {
ItemStack var5 = var4.getStack(); ItemStack stack = slot.getStack();
var3 = var5.copy(); rStack = stack.copy();
if(par2 <= 2) { if(index <= 3) {
if(!this.mergeItemStack(var5, 3, this.inventorySlots.size(), true)) { if(!this.mergeItemStack(stack, 4, this.inventorySlots.size(), true)) {
return null; return null;
} }
var4.onSlotChange(var5, var3); slot.onSlotChange(stack, rStack);
} else if(!this.mergeItemStack(var5, 1, 2, false)) { } else {
if(!this.mergeItemStack(var5, 0, 1, false))
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; return null;
} }
if(var5.stackSize == 0) { if(stack.stackSize == 0) {
var4.putStack((ItemStack) null); slot.putStack((ItemStack) null);
} else { } else {
var4.onSlotChanged(); slot.onSlotChanged();
} }
} }
return var3; return rStack;
} }
@Override @Override

43
src/main/java/com/hbm/inventory/container/ContainerMachineArcFurnace.java
View File

@ -1,7 +1,11 @@
package com.hbm.inventory.container; package com.hbm.inventory.container;
import com.hbm.inventory.SlotSmelting; import com.hbm.inventory.SlotSmelting;
import com.hbm.items.ModItems;
import com.hbm.items.machine.ItemMachineUpgrade;
import com.hbm.tileentity.machine.TileEntityMachineArcFurnace; import com.hbm.tileentity.machine.TileEntityMachineArcFurnace;
import api.hbm.energy.IBatteryItem;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
@ -41,34 +45,43 @@ public class ContainerMachineArcFurnace extends Container {
} }
@Override @Override
public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) { public ItemStack transferStackInSlot(EntityPlayer player, int index) {
ItemStack var3 = null; ItemStack rStack = null;
Slot var4 = (Slot) this.inventorySlots.get(par2); Slot slot = (Slot) this.inventorySlots.get(index);
if(var4 != null && var4.getHasStack()) { if(slot != null && slot.getHasStack()) {
ItemStack var5 = var4.getStack(); ItemStack stack = slot.getStack();
var3 = var5.copy(); rStack = stack.copy();
if(par2 <= 5) { if(index <= 5) {
if(!this.mergeItemStack(var5, 6, this.inventorySlots.size(), true)) { if(!this.mergeItemStack(stack, 6, this.inventorySlots.size(), true)) {
return null; return null;
} }
var4.onSlotChange(var5, var3); slot.onSlotChange(stack, rStack);
} else if(!this.mergeItemStack(var5, 0, 1, false)) { } else {
if(!this.mergeItemStack(var5, 2, 6, false))
if(rStack.getItem() instanceof IBatteryItem || rStack.getItem() == ModItems.battery_creative) {
if(!this.mergeItemStack(stack, 5, 6, false))
return null;
} else if(rStack.getItem() == ModItems.arc_electrode_desh || rStack.getItem() == ModItems.arc_electrode) {
if(!this.mergeItemStack(stack, 2, 5, false))
return null;
} else if(!this.mergeItemStack(stack, 0, 1, false))
return null; return null;
} }
if(var5.stackSize == 0) { if(stack.stackSize == 0) {
var4.putStack((ItemStack) null); slot.putStack((ItemStack) null);
} else { } else {
var4.onSlotChanged(); slot.onSlotChanged();
} }
} }
return var3; return rStack;
} }
@Override @Override

35
src/main/java/com/hbm/inventory/container/ContainerMachineArcWelder.java
View File

@ -3,6 +3,7 @@ package com.hbm.inventory.container;
import com.hbm.inventory.SlotCraftingOutput; import com.hbm.inventory.SlotCraftingOutput;
import com.hbm.inventory.SlotUpgrade; import com.hbm.inventory.SlotUpgrade;
import com.hbm.items.ModItems; import com.hbm.items.ModItems;
import com.hbm.items.machine.IItemFluidIdentifier;
import com.hbm.items.machine.ItemMachineUpgrade; import com.hbm.items.machine.ItemMachineUpgrade;
import com.hbm.tileentity.machine.TileEntityMachineArcWelder; import com.hbm.tileentity.machine.TileEntityMachineArcWelder;
@ -52,35 +53,37 @@ public class ContainerMachineArcWelder extends Container {
@Override @Override
public ItemStack transferStackInSlot(EntityPlayer player, int index) { public ItemStack transferStackInSlot(EntityPlayer player, int index) {
ItemStack var3 = null; ItemStack rStack = null;
Slot var4 = (Slot) this.inventorySlots.get(index); Slot slot = (Slot) this.inventorySlots.get(index);
if(var4 != null && var4.getHasStack()) { if(slot != null && slot.getHasStack()) {
ItemStack var5 = var4.getStack(); ItemStack stack = slot.getStack();
var3 = var5.copy(); rStack = stack.copy();
if(index <= 3) { if(index <= 7) {
if(!this.mergeItemStack(var5, 4, this.inventorySlots.size(), true)) { if(!this.mergeItemStack(stack, 8, this.inventorySlots.size(), true)) {
return null; return null;
} }
} else { } else {
if(var3.getItem() instanceof IBatteryItem || var3.getItem() == ModItems.battery_creative) { if(rStack.getItem() instanceof IBatteryItem || rStack.getItem() == ModItems.battery_creative) {
if(!this.mergeItemStack(var5, 4, 5, false)) return null; if(!this.mergeItemStack(stack, 4, 5, false)) return null;
} else if(var3.getItem() instanceof ItemMachineUpgrade ) { } else if(rStack.getItem() instanceof IItemFluidIdentifier) {
if(!this.mergeItemStack(var5, 6, 8, false)) return null; if(!this.mergeItemStack(stack, 5, 6, false)) return null;
} else if(rStack.getItem() instanceof ItemMachineUpgrade ) {
if(!this.mergeItemStack(stack, 6, 8, false)) return null;
} else { } else {
if(!this.mergeItemStack(var5, 0, 3, false)) return null; if(!this.mergeItemStack(stack, 0, 3, false)) return null;
} }
} }
if(var5.stackSize == 0) { if(stack.stackSize == 0) {
var4.putStack((ItemStack) null); slot.putStack((ItemStack) null);
} else { } else {
var4.onSlotChanged(); slot.onSlotChanged();
} }
} }
return var3; return rStack;
} }
} }