mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
undo all of the PA stuff
This commit is contained in:
Boblet
parent
bd59ae5970
commit
8522b584d4
@ -1,3 +1,7 @@
|
||||
## Changed
|
||||
* Particle detectors now print an error for when the recipe could not be completed
|
||||
|
||||
## Fixed
|
||||
* Fixed items being annihilated when shift clicking them into the particle source
|
||||
* Fixed packet optimization not allowing packets to be sent when the day night cycle is halted
|
||||
* Fixed packet optimization not allowing packets to be sent when the day night cycle is halted
|
||||
* Fixed particle detectors not always using power when they should
|
||||
321
src/main/java/com/hbm/inventory/container/ContainerNT.java
Normal file
321
src/main/java/com/hbm/inventory/container/ContainerNT.java
Normal file
@ -0,0 +1,321 @@
|
||||
package com.hbm.inventory.container;
|
||||
|
||||
import java.util.Iterator;
|
||||
|
||||
import com.hbm.util.InventoryUtil;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.inventory.Container;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public abstract class ContainerNT extends Container {
|
||||
|
||||
/**
|
||||
* Fix: mergeItemStack does not respect inventory or slot stack limitations.
|
||||
* We simply intercept the method and call InventoryUtil.mergeItemStack which
|
||||
* runs the same logic but respecting stack limits.
|
||||
*/
|
||||
@Override
|
||||
protected boolean mergeItemStack(ItemStack stack, int start, int end, boolean reverse) {
|
||||
return InventoryUtil.mergeItemStack(inventorySlots, stack, start, end, reverse);
|
||||
}
|
||||
|
||||
/**
|
||||
* Fix: the default behavior of transferStackInSlot simply crashes the game.
|
||||
* We intercept this part and return null, which means that by default, the
|
||||
* shift click function does nothing.
|
||||
*/
|
||||
@Override
|
||||
public ItemStack transferStackInSlot(EntityPlayer player, int index) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack slotClick(int index, int button, int mode, EntityPlayer player) {
|
||||
|
||||
ItemStack itemstack = null;
|
||||
InventoryPlayer invPlayer = player.inventory;
|
||||
int i1;
|
||||
ItemStack itemstack3;
|
||||
|
||||
if(mode == 5) {
|
||||
int l = this.field_94536_g;
|
||||
this.field_94536_g = func_94532_c(button);
|
||||
|
||||
if((l != 1 || this.field_94536_g != 2) && l != this.field_94536_g) {
|
||||
this.func_94533_d();
|
||||
} else if(invPlayer.getItemStack() == null) {
|
||||
this.func_94533_d();
|
||||
} else if(this.field_94536_g == 0) {
|
||||
this.field_94535_f = func_94529_b(button);
|
||||
|
||||
if(func_94528_d(this.field_94535_f)) {
|
||||
this.field_94536_g = 1;
|
||||
this.field_94537_h.clear();
|
||||
} else {
|
||||
this.func_94533_d();
|
||||
}
|
||||
} else if(this.field_94536_g == 1) {
|
||||
Slot slot = (Slot) this.inventorySlots.get(index);
|
||||
|
||||
if(slot != null && func_94527_a(slot, invPlayer.getItemStack(), true) && slot.isItemValid(invPlayer.getItemStack())
|
||||
&& invPlayer.getItemStack().stackSize > this.field_94537_h.size() && this.canDragIntoSlot(slot)) {
|
||||
this.field_94537_h.add(slot);
|
||||
}
|
||||
} else if(this.field_94536_g == 2) {
|
||||
if(!this.field_94537_h.isEmpty()) {
|
||||
itemstack3 = invPlayer.getItemStack().copy();
|
||||
i1 = invPlayer.getItemStack().stackSize;
|
||||
Iterator iterator = this.field_94537_h.iterator();
|
||||
|
||||
while(iterator.hasNext()) {
|
||||
Slot slot1 = (Slot) iterator.next();
|
||||
|
||||
if(slot1 != null && func_94527_a(slot1, invPlayer.getItemStack(), true) && slot1.isItemValid(invPlayer.getItemStack())
|
||||
&& invPlayer.getItemStack().stackSize >= this.field_94537_h.size() && this.canDragIntoSlot(slot1)) {
|
||||
ItemStack stackCopy = itemstack3.copy();
|
||||
int j1 = slot1.getHasStack() ? slot1.getStack().stackSize : 0;
|
||||
func_94525_a(this.field_94537_h, this.field_94535_f, stackCopy, j1);
|
||||
|
||||
if(stackCopy.stackSize > stackCopy.getMaxStackSize()) {
|
||||
stackCopy.stackSize = stackCopy.getMaxStackSize();
|
||||
}
|
||||
|
||||
if(stackCopy.stackSize > slot1.getSlotStackLimit()) {
|
||||
stackCopy.stackSize = slot1.getSlotStackLimit();
|
||||
}
|
||||
|
||||
i1 -= stackCopy.stackSize - j1;
|
||||
slot1.putStack(stackCopy);
|
||||
}
|
||||
}
|
||||
|
||||
itemstack3.stackSize = i1;
|
||||
|
||||
if(itemstack3.stackSize <= 0) {
|
||||
itemstack3 = null;
|
||||
}
|
||||
|
||||
invPlayer.setItemStack(itemstack3);
|
||||
}
|
||||
|
||||
this.func_94533_d();
|
||||
} else {
|
||||
this.func_94533_d();
|
||||
}
|
||||
} else if(this.field_94536_g != 0) {
|
||||
this.func_94533_d();
|
||||
} else {
|
||||
Slot slot2;
|
||||
int l1;
|
||||
ItemStack itemstack5;
|
||||
|
||||
if((mode == 0 || mode == 1) && (button == 0 || button == 1)) {
|
||||
if(index == -999) {
|
||||
if(invPlayer.getItemStack() != null && index == -999) {
|
||||
if(button == 0) {
|
||||
player.dropPlayerItemWithRandomChoice(invPlayer.getItemStack(), true);
|
||||
invPlayer.setItemStack((ItemStack) null);
|
||||
}
|
||||
|
||||
if(button == 1) {
|
||||
player.dropPlayerItemWithRandomChoice(invPlayer.getItemStack().splitStack(1), true);
|
||||
|
||||
if(invPlayer.getItemStack().stackSize == 0) {
|
||||
invPlayer.setItemStack((ItemStack) null);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if(mode == 1) {
|
||||
if(index < 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
slot2 = (Slot) this.inventorySlots.get(index);
|
||||
|
||||
if(slot2 != null && slot2.canTakeStack(player)) {
|
||||
itemstack3 = this.transferStackInSlot(player, index);
|
||||
|
||||
if(itemstack3 != null) {
|
||||
Item item = itemstack3.getItem();
|
||||
itemstack = itemstack3.copy();
|
||||
|
||||
if(slot2.getStack() != null && slot2.getStack().getItem() == item) {
|
||||
this.retrySlotClick(index, button, true, player);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if(index < 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
slot2 = (Slot) this.inventorySlots.get(index);
|
||||
|
||||
if(slot2 != null) {
|
||||
itemstack3 = slot2.getStack();
|
||||
ItemStack itemstack4 = invPlayer.getItemStack();
|
||||
|
||||
if(itemstack3 != null) {
|
||||
itemstack = itemstack3.copy();
|
||||
}
|
||||
|
||||
if(itemstack3 == null) {
|
||||
if(itemstack4 != null && slot2.isItemValid(itemstack4)) {
|
||||
l1 = button == 0 ? itemstack4.stackSize : 1;
|
||||
|
||||
if(l1 > slot2.getSlotStackLimit()) {
|
||||
l1 = slot2.getSlotStackLimit();
|
||||
}
|
||||
|
||||
if(itemstack4.stackSize >= l1) {
|
||||
slot2.putStack(itemstack4.splitStack(l1));
|
||||
}
|
||||
|
||||
if(itemstack4.stackSize == 0) {
|
||||
invPlayer.setItemStack((ItemStack) null);
|
||||
}
|
||||
}
|
||||
} else if(slot2.canTakeStack(player)) {
|
||||
if(itemstack4 == null) {
|
||||
l1 = button == 0 ? itemstack3.stackSize : (itemstack3.stackSize + 1) / 2;
|
||||
itemstack5 = slot2.decrStackSize(l1);
|
||||
invPlayer.setItemStack(itemstack5);
|
||||
|
||||
if(itemstack3.stackSize == 0) {
|
||||
slot2.putStack((ItemStack) null);
|
||||
}
|
||||
|
||||
slot2.onPickupFromSlot(player, invPlayer.getItemStack());
|
||||
} else if(slot2.isItemValid(itemstack4)) {
|
||||
if(itemstack3.getItem() == itemstack4.getItem() && itemstack3.getItemDamage() == itemstack4.getItemDamage()
|
||||
&& ItemStack.areItemStackTagsEqual(itemstack3, itemstack4)) {
|
||||
l1 = button == 0 ? itemstack4.stackSize : 1;
|
||||
|
||||
if(l1 > slot2.getSlotStackLimit() - itemstack3.stackSize) {
|
||||
l1 = slot2.getSlotStackLimit() - itemstack3.stackSize;
|
||||
}
|
||||
|
||||
if(l1 > itemstack4.getMaxStackSize() - itemstack3.stackSize) {
|
||||
l1 = itemstack4.getMaxStackSize() - itemstack3.stackSize;
|
||||
}
|
||||
|
||||
itemstack4.splitStack(l1);
|
||||
|
||||
if(itemstack4.stackSize == 0) {
|
||||
invPlayer.setItemStack((ItemStack) null);
|
||||
}
|
||||
|
||||
itemstack3.stackSize += l1;
|
||||
} else if(itemstack4.stackSize <= slot2.getSlotStackLimit()) {
|
||||
slot2.putStack(itemstack4);
|
||||
invPlayer.setItemStack(itemstack3);
|
||||
}
|
||||
} else if(itemstack3.getItem() == itemstack4.getItem() && itemstack4.getMaxStackSize() > 1
|
||||
&& (!itemstack3.getHasSubtypes() || itemstack3.getItemDamage() == itemstack4.getItemDamage()) && ItemStack.areItemStackTagsEqual(itemstack3, itemstack4)) {
|
||||
l1 = itemstack3.stackSize;
|
||||
|
||||
if(l1 > 0 && l1 + itemstack4.stackSize <= itemstack4.getMaxStackSize()) {
|
||||
itemstack4.stackSize += l1;
|
||||
itemstack3 = slot2.decrStackSize(l1);
|
||||
|
||||
if(itemstack3.stackSize == 0) {
|
||||
slot2.putStack((ItemStack) null);
|
||||
}
|
||||
|
||||
slot2.onPickupFromSlot(player, invPlayer.getItemStack());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
slot2.onSlotChanged();
|
||||
}
|
||||
}
|
||||
} else if(mode == 2 && button >= 0 && button < 9) {
|
||||
slot2 = (Slot) this.inventorySlots.get(index);
|
||||
|
||||
if(slot2.canTakeStack(player)) {
|
||||
itemstack3 = invPlayer.getStackInSlot(button);
|
||||
boolean flag = itemstack3 == null || slot2.inventory == invPlayer && slot2.isItemValid(itemstack3);
|
||||
l1 = -1;
|
||||
|
||||
if(!flag) {
|
||||
l1 = invPlayer.getFirstEmptyStack();
|
||||
flag |= l1 > -1;
|
||||
}
|
||||
|
||||
if(slot2.getHasStack() && flag) {
|
||||
itemstack5 = slot2.getStack();
|
||||
invPlayer.setInventorySlotContents(button, itemstack5.copy());
|
||||
|
||||
if((slot2.inventory != invPlayer || !slot2.isItemValid(itemstack3)) && itemstack3 != null) {
|
||||
if(l1 > -1) {
|
||||
invPlayer.addItemStackToInventory(itemstack3);
|
||||
slot2.decrStackSize(itemstack5.stackSize);
|
||||
slot2.putStack((ItemStack) null);
|
||||
slot2.onPickupFromSlot(player, itemstack5);
|
||||
}
|
||||
} else {
|
||||
slot2.decrStackSize(itemstack5.stackSize);
|
||||
slot2.putStack(itemstack3);
|
||||
slot2.onPickupFromSlot(player, itemstack5);
|
||||
}
|
||||
} else if(!slot2.getHasStack() && itemstack3 != null && slot2.isItemValid(itemstack3)) {
|
||||
invPlayer.setInventorySlotContents(button, (ItemStack) null);
|
||||
slot2.putStack(itemstack3);
|
||||
}
|
||||
}
|
||||
} else if(mode == 3 && player.capabilities.isCreativeMode && invPlayer.getItemStack() == null && index >= 0) {
|
||||
slot2 = (Slot) this.inventorySlots.get(index);
|
||||
|
||||
if(slot2 != null && slot2.getHasStack()) {
|
||||
itemstack3 = slot2.getStack().copy();
|
||||
itemstack3.stackSize = itemstack3.getMaxStackSize();
|
||||
invPlayer.setItemStack(itemstack3);
|
||||
}
|
||||
} else if(mode == 4 && invPlayer.getItemStack() == null && index >= 0) {
|
||||
slot2 = (Slot) this.inventorySlots.get(index);
|
||||
|
||||
if(slot2 != null && slot2.getHasStack() && slot2.canTakeStack(player)) {
|
||||
itemstack3 = slot2.decrStackSize(button == 0 ? 1 : slot2.getStack().stackSize);
|
||||
slot2.onPickupFromSlot(player, itemstack3);
|
||||
player.dropPlayerItemWithRandomChoice(itemstack3, true);
|
||||
}
|
||||
} else if(mode == 6 && index >= 0) {
|
||||
slot2 = (Slot) this.inventorySlots.get(index);
|
||||
itemstack3 = invPlayer.getItemStack();
|
||||
|
||||
if(itemstack3 != null && (slot2 == null || !slot2.getHasStack() || !slot2.canTakeStack(player))) {
|
||||
i1 = button == 0 ? 0 : this.inventorySlots.size() - 1;
|
||||
l1 = button == 0 ? 1 : -1;
|
||||
|
||||
for(int i2 = 0; i2 < 2; ++i2) {
|
||||
for(int j2 = i1; j2 >= 0 && j2 < this.inventorySlots.size() && itemstack3.stackSize < itemstack3.getMaxStackSize(); j2 += l1) {
|
||||
Slot slot3 = (Slot) this.inventorySlots.get(j2);
|
||||
|
||||
if(slot3.getHasStack() && func_94527_a(slot3, itemstack3, true) && slot3.canTakeStack(player) && this.func_94530_a(itemstack3, slot3)
|
||||
&& (i2 != 0 || slot3.getStack().stackSize != slot3.getStack().getMaxStackSize())) {
|
||||
int k1 = Math.min(itemstack3.getMaxStackSize() - itemstack3.stackSize, slot3.getStack().stackSize);
|
||||
ItemStack itemstack2 = slot3.decrStackSize(k1);
|
||||
itemstack3.stackSize += k1;
|
||||
|
||||
if(itemstack2.stackSize <= 0) {
|
||||
slot3.putStack((ItemStack) null);
|
||||
}
|
||||
|
||||
slot3.onPickupFromSlot(player, itemstack2);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
this.detectAndSendChanges();
|
||||
}
|
||||
}
|
||||
|
||||
return itemstack;
|
||||
}
|
||||
}
|
||||
@ -39,4 +39,7 @@ public net.minecraft.world.gen.ChunkProviderServer field_73248_b # ch
|
||||
public net.minecraft.client.renderer.ItemRenderer field_78453_b # itemToRender
|
||||
|
||||
# AbstractResourcePack
|
||||
public net.minecraft.client.resources.AbstractResourcePack field_110597_b # resourcePackFile
|
||||
public net.minecraft.client.resources.AbstractResourcePack field_110597_b # resourcePackFile
|
||||
|
||||
# Container
|
||||
public net.minecraft.inventory.Container * # fucking everything i hate this class
|
||||
Loading…
x
Reference in New Issue
Block a user